From abdb2d53962f726a2be96f6439074ebf2cc85e60 Mon Sep 17 00:00:00 2001
From: imp <imp@fanruan.com>
Date: Thu, 7 Sep 2017 22:14:19 +0800
Subject: [PATCH] update

---
 bi/slider.js              |  6 +++---
 dist/slider.js            |  6 +++---
 src/less/typographic.less | 10 ++++++++++
 src/less/var.less         | 15 ++++++++-------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/bi/slider.js b/bi/slider.js
index d49ba1431d..4d6770f4b4 100644
--- a/bi/slider.js
+++ b/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) {
diff --git a/dist/slider.js b/dist/slider.js
index d49ba1431d..4d6770f4b4 100644
--- a/dist/slider.js
+++ b/dist/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) {
diff --git a/src/less/typographic.less b/src/less/typographic.less
index d40a717816..27aeba2703 100644
--- a/src/less/typographic.less
+++ b/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;
diff --git a/src/less/var.less b/src/less/var.less
index b96af6f851..3fca16ab2b 100644
--- a/src/less/var.less
+++ b/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;
\ No newline at end of file
+@zIndex-tip:      1000000000;