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
699599f189 ea37b941a2
commit
eaae9aa8f5
10 changed files with 401 additions and 394 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. 2
      bi/base.js
  2. 1
      bi/sliders.js
  3. 58
      demo/js/addons/slider/demo.slider.js
  4. 2
      dist/base.js
  5. 2
      dist/bundle.js
  6. 22
      dist/bundle.min.js
  7. 58
      dist/demo.js
  8. 1
      dist/sliders.js
  9. 1
      src/addons/sliders/js/singleslider/singleslider.js
  10. 2
      src/base/combination/combo.js

2
bi/base.js
Unescape View File

@ -3261,7 +3261,7 @@ 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).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]);

1
bi/sliders.js
Unescape View File

@ -1451,6 +1451,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
this.min = 0;
this.max = 0;
this._setBlueTrack(0);
},
populate: function () {

58
demo/js/addons/slider/demo.slider.js
Unescape View File

@ -2,24 +2,27 @@
* Created by Urthur on 2017/9/4.
*/
Demo.Slider = BI.inherit(BI.Widget, {
_props: {
props: {
baseCls: "demo-slider",
min: 10,
max: 50
width: 300,
height: 50,
min: 0,
max: 100
},
render: function () {
var self = this, o = this.options;
var singleSlider = BI.createWidget({
type: "bi.single_slider",
digit: 0,
width: 300,
height: 50,
width: o.width,
height: o.height,
cls: "layout-bg-white"
});
singleSlider.setMinAndMax({
min: 10,
max: 100
max: o.max
});
singleSlider.setValue(30);
@ -28,43 +31,42 @@ Demo.Slider = BI.inherit(BI.Widget, {
console.log(this.getValue());
});
var singleSliderLabel = BI.createWidget({
type: "bi.single_slider_label",
height: 50,
width: 300,
digit: 0,
unit: "个",
cls: "layout-bg-white"
});
singleSliderLabel.setMinAndMax({
min: 0,
max: 100
});
singleSliderLabel.setValue(10);
singleSliderLabel.populate();
var normalSingleSlider = BI.createWidget({
type: "bi.single_slider_normal",
width: o.width,
height: 30,
width: 300,
cls: "layout-bg-white"
});
normalSingleSlider.setMinAndMax({
min: 0,
max: 100
min: o.min,
max: o.max
});
normalSingleSlider.setValue(10);
normalSingleSlider.populate();
var singleSliderLabel = BI.createWidget({
type: "bi.single_slider_label",
width: o.width,
height: o.height,
digit: 0,
unit: "个",
cls: "layout-bg-white"
});
singleSliderLabel.setMinAndMax({
min: o.min,
max: o.max
});
singleSliderLabel.setValue(10);
singleSliderLabel.populate();
var intervalSlider = BI.createWidget({
type: "bi.interval_slider",
width: 300,
width: o.width,
cls: "layout-bg-white"
});
intervalSlider.setMinAndMax({
min: 0,
max: 120
min: o.min,
max: o.max
});
intervalSlider.setValue({
min: 10,
@ -74,7 +76,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
var intervalSliderLabel = BI.createWidget({
type: "bi.interval_slider_label",
width: 300,
width: o.width,
unit: "个",
cls: "layout-bg-white"
});

2
dist/base.js vendored
Unescape View File

@ -3261,7 +3261,7 @@ 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).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]);

2
dist/bundle.js vendored
Unescape View File

@ -32284,7 +32284,7 @@ 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).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]);

22
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

58
dist/demo.js vendored
Unescape View File

@ -13,24 +13,27 @@ $(function () {
* Created by Urthur on 2017/9/4.
*/
Demo.Slider = BI.inherit(BI.Widget, {
_props: {
props: {
baseCls: "demo-slider",
min: 10,
max: 50
width: 300,
height: 50,
min: 0,
max: 100
},
render: function () {
var self = this, o = this.options;
var singleSlider = BI.createWidget({
type: "bi.single_slider",
digit: 0,
width: 300,
height: 50,
width: o.width,
height: o.height,
cls: "layout-bg-white"
});
singleSlider.setMinAndMax({
min: 10,
max: 100
max: o.max
});
singleSlider.setValue(30);
@ -39,43 +42,42 @@ Demo.Slider = BI.inherit(BI.Widget, {
console.log(this.getValue());
});
var singleSliderLabel = BI.createWidget({
type: "bi.single_slider_label",
height: 50,
width: 300,
digit: 0,
unit: "个",
cls: "layout-bg-white"
});
singleSliderLabel.setMinAndMax({
min: 0,
max: 100
});
singleSliderLabel.setValue(10);
singleSliderLabel.populate();
var normalSingleSlider = BI.createWidget({
type: "bi.single_slider_normal",
width: o.width,
height: 30,
width: 300,
cls: "layout-bg-white"
});
normalSingleSlider.setMinAndMax({
min: 0,
max: 100
min: o.min,
max: o.max
});
normalSingleSlider.setValue(10);
normalSingleSlider.populate();
var singleSliderLabel = BI.createWidget({
type: "bi.single_slider_label",
width: o.width,
height: o.height,
digit: 0,
unit: "个",
cls: "layout-bg-white"
});
singleSliderLabel.setMinAndMax({
min: o.min,
max: o.max
});
singleSliderLabel.setValue(10);
singleSliderLabel.populate();
var intervalSlider = BI.createWidget({
type: "bi.interval_slider",
width: 300,
width: o.width,
cls: "layout-bg-white"
});
intervalSlider.setMinAndMax({
min: 0,
max: 120
min: o.min,
max: o.max
});
intervalSlider.setValue({
min: 10,
@ -85,7 +87,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
var intervalSliderLabel = BI.createWidget({
type: "bi.interval_slider_label",
width: 300,
width: o.width,
unit: "个",
cls: "layout-bg-white"
});

1
dist/sliders.js vendored
Unescape View File

@ -1451,6 +1451,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
this.min = 0;
this.max = 0;
this._setBlueTrack(0);
},
populate: function () {

1
src/addons/sliders/js/singleslider/singleslider.js
Unescape View File

@ -272,6 +272,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
this.min = 0;
this.max = 0;
this._setBlueTrack(0);
},
populate: function () {

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

@ -219,7 +219,7 @@ 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).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]);

Write Preview
Loading…
Cancel
Save