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

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
50378d6f7d a4ec8b92da
commit
36a9bb293b
10 changed files with 96 additions and 104 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. 20
      bi/base.js
  2. 16
      bi/widget.js
  3. 20
      dist/base.js
  4. 36
      dist/bundle.js
  5. 56
      dist/bundle.min.js
  6. 16
      dist/widget.js
  7. 2
      src/base/combination/combo.js
  8. 4
      src/base/single/button/button.basic.js
  9. 14
      src/base/single/editor/editor.code.js
  10. 16
      src/widget/numbereditor/number.editor.js

20
bi/base.js
Unescape View File

@ -908,7 +908,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
return;
}
interval = setInterval(function () {
self.doClick();
if(self.isEnabled()){
self.doClick();
}
}, 100);
mouseDown = true;
ev(e);
@ -3263,7 +3265,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return;
// }
//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的公式弹框需要特殊处理下
if (this.element.find(e.target).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]);
@ -19062,13 +19064,13 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.CodeEditor.EVENT_BLUR);
});
this.editor.on("mousedown", function (cm, e) {
//IE下mousedown之后会触发blur,所以nextTick后再做focus
BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
});
//e.stopPropagation();
});
// this.editor.on("mousedown", function (cm, e) {
// //IE下mousedown之后会触发blur,所以nextTick后再做focus
// BI.nextTick(function () {
// self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
// });
// //e.stopPropagation();
// });
// this.editor.on("blur", function () {
// self.editor.execCommand("goLineEnd");

16
bi/widget.js
Unescape View File

@ -12036,11 +12036,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
@ -12048,11 +12046,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
BI.createWidget({
type: "bi.htape",

20
dist/base.js vendored
Unescape View File

@ -908,7 +908,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
return;
}
interval = setInterval(function () {
self.doClick();
if(self.isEnabled()){
self.doClick();
}
}, 100);
mouseDown = true;
ev(e);
@ -3263,7 +3265,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return;
// }
//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的公式弹框需要特殊处理下
if (this.element.find(e.target).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]);
@ -19062,13 +19064,13 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.CodeEditor.EVENT_BLUR);
});
this.editor.on("mousedown", function (cm, e) {
//IE下mousedown之后会触发blur,所以nextTick后再做focus
BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
});
//e.stopPropagation();
});
// this.editor.on("mousedown", function (cm, e) {
// //IE下mousedown之后会触发blur,所以nextTick后再做focus
// BI.nextTick(function () {
// self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
// });
// //e.stopPropagation();
// });
// this.editor.on("blur", function () {
// self.editor.execCommand("goLineEnd");

36
dist/bundle.js vendored
Unescape View File

@ -29937,7 +29937,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
return;
}
interval = setInterval(function () {
self.doClick();
if(self.isEnabled()){
self.doClick();
}
}, 100);
mouseDown = true;
ev(e);
@ -32292,7 +32294,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return;
// }
//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的公式弹框需要特殊处理下
if (this.element.find(e.target).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]);
@ -48091,13 +48093,13 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.CodeEditor.EVENT_BLUR);
});
this.editor.on("mousedown", function (cm, e) {
//IE下mousedown之后会触发blur,所以nextTick后再做focus
BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
});
//e.stopPropagation();
});
// this.editor.on("mousedown", function (cm, e) {
// //IE下mousedown之后会触发blur,所以nextTick后再做focus
// BI.nextTick(function () {
// self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
// });
// //e.stopPropagation();
// });
// this.editor.on("blur", function () {
// self.editor.execCommand("goLineEnd");
@ -90544,11 +90546,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
@ -90556,11 +90556,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
BI.createWidget({
type: "bi.htape",

56
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/widget.js vendored
Unescape View File

@ -12036,11 +12036,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
@ -12048,11 +12046,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
BI.createWidget({
type: "bi.htape",

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

@ -221,7 +221,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return;
// }
//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的公式弹框需要特殊处理下
if (this.element.find(e.target).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]);

4
src/base/single/button/button.basic.js
Unescape View File

@ -177,7 +177,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
return;
}
interval = setInterval(function () {
self.doClick();
if(self.isEnabled()){
self.doClick();
}
}, 100);
mouseDown = true;
ev(e);

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

@ -45,13 +45,13 @@ BI.CodeEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.CodeEditor.EVENT_BLUR);
});
this.editor.on("mousedown", function (cm, e) {
//IE下mousedown之后会触发blur,所以nextTick后再做focus
BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
});
//e.stopPropagation();
});
// this.editor.on("mousedown", function (cm, e) {
// //IE下mousedown之后会触发blur,所以nextTick后再做focus
// BI.nextTick(function () {
// self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
// });
// //e.stopPropagation();
// });
// this.editor.on("blur", function () {
// self.editor.execCommand("goLineEnd");

16
src/widget/numbereditor/number.editor.js
Unescape View File

@ -41,11 +41,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
@ -53,11 +51,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if(this.isEnabled()){
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
}
self._finetuning(-o.step);
self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
});
BI.createWidget({
type: "bi.htape",

Write Preview
Loading…
Cancel
Save