imp 7 years ago
parent
commit
abdb2d5396
  1. 6
      bi/slider.js
  2. 6
      dist/slider.js
  3. 10
      src/less/typographic.less
  4. 15
      src/less/var.less

6
bi/slider.js

@ -45,7 +45,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
},
_defaultConfig: function () {
return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-button bi-button-track"
baseCls: "bi-single-slider bi-slider-track"
});
},
_init: function () {
@ -124,7 +124,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
});
this.label = BI.createWidget({
type: "bi.sign_editor",
cls: "button-editor-button bi-border",
cls: "slider-editor-button bi-border",
errorText: "",
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
@ -216,7 +216,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
},
_checkValidation: function (v) {
return !(BI.isNull(v) || v < this.min || v > this.max)
return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)
},
_setBlueTrack: function (percent) {

6
dist/slider.js vendored

@ -45,7 +45,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
},
_defaultConfig: function () {
return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-button bi-button-track"
baseCls: "bi-single-slider bi-slider-track"
});
},
_init: function () {
@ -124,7 +124,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
});
this.label = BI.createWidget({
type: "bi.sign_editor",
cls: "button-editor-button bi-border",
cls: "slider-editor-button bi-border",
errorText: "",
height: c.HEIGHT,
width: c.EDITOR_WIDTH,
@ -216,7 +216,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
},
_checkValidation: function (v) {
return !(BI.isNull(v) || v < this.min || v > this.max)
return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)
},
_setBlueTrack: function (percent) {

10
src/less/typographic.less

@ -25,6 +25,16 @@
overflow-y: hidden;
white-space:nowrap;
}
.user-select(@select) {
-webkit-user-select: @select;
-khtml-user-select: @select;
-moz-user-select: @select;
-ms-user-select: @select;
-o-user-select: @select;
user-select: @select;
}
.user-select-disable(){
-webkit-user-select: none;
-khtml-user-select: none;

15
src/less/var.less

@ -1,13 +1,14 @@
@webUrl: '';
@imageUrl: 'images/1x/'; //图片的基本地址
@image2xUrl: 'images/2x/'; //图片的基本地址
@webUrl: '${remoteServletURL}?op=resource&resource=/com/fr/bi/web/';
@imageUrl: '${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/'; //图片的基本地址
@image2xUrl: '${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/2x/'; //2x图片的基本地址
@cursor: '@{webUrl}cursor/cursor_hand.cur';
@dragCursor: '@{webUrl}cursor/cursor_drag_hand.cur';
@leftRightCursor:'@{webUrl}cursor/cursor_left_right.cur';
@cursor: '@{webUrl}images/cursor/cursor_hand.cur';
@dragCursor: '@{webUrl}images/cursor/cursor_drag_hand.cur';
@leftRightCursor: '@{webUrl}images/cursor/cursor_left_right.cur';
@sliderDragCursor: '@{imageUrl}cursor/cursor_drag_slider.cur';
@zIndex-layer: 100000;
@zIndex-floatbox: 1000000;
@zIndex-popup: 10000000;
@zIndex-masker: 100000000;
@zIndex-tip: 1000000000;
@zIndex-tip: 1000000000;

Loading…
Cancel
Save