Merge pull request #142 in ~GUY/fineui from ~IMP/fineui_guy:master to master

* commit 'abdb2d53962f726a2be96f6439074ebf2cc85e60':
  update
  conflict
  less and css

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) {

bi/widget.css

@@ -171,6 +171,45 @@
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
+.bi-multidate-combo {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-multidate-popup .bi-multidate-popup-label {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+.bi-multidate-popup .bi-multidate-popup-item:active,
+.bi-multidate-popup .bi-multidate-popup-item.active {
+  background-color: #3f8ce8;
+  color: #ffffff;
+  -webkit-border-radius: 2px 2px 0 0;
+  -moz-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+}
+.bi-multidate-popup .bi-multidate-popup-button {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-multidate-segment .bi-multidate-editor {
+  font-size: 14px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }
@@ -390,6 +429,30 @@
   box-sizing: border-box;
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-single-slider-slider .slider-button {
+  cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  border-radius: 7px;
+}
+.bi-slider-track .gray-track {
+  background-color: rgba(153, 153, 153, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-slider-track .blue-track {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-slider .bi-slider-track {
@@ -399,6 +462,12 @@
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+.bi-param-time-interval.time-error .bi-input {
+  color: #e85050;
+}
+.bi-param-time-interval.time-error .sign-editor-text {
+  color: #e85050;
+}
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-popup .year-popup-navigation {

dist/bundle.css

@@ -2940,6 +2940,45 @@ li.CodeMirror-hint-active {
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
+.bi-multidate-combo {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-multidate-popup .bi-multidate-popup-label {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+.bi-multidate-popup .bi-multidate-popup-item:active,
+.bi-multidate-popup .bi-multidate-popup-item.active {
+  background-color: #3f8ce8;
+  color: #ffffff;
+  -webkit-border-radius: 2px 2px 0 0;
+  -moz-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+}
+.bi-multidate-popup .bi-multidate-popup-button {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-multidate-segment .bi-multidate-editor {
+  font-size: 14px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }
@@ -3159,6 +3198,30 @@ li.CodeMirror-hint-active {
   box-sizing: border-box;
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-single-slider-slider .slider-button {
+  cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  border-radius: 7px;
+}
+.bi-slider-track .gray-track {
+  background-color: rgba(153, 153, 153, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-slider-track .blue-track {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-slider .bi-slider-track {
@@ -3168,6 +3231,12 @@ li.CodeMirror-hint-active {
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+.bi-param-time-interval.time-error .bi-input {
+  color: #e85050;
+}
+.bi-param-time-interval.time-error .sign-editor-text {
+  color: #e85050;
+}
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-popup .year-popup-navigation {

dist/demo.js

@@ -4487,7 +4487,41 @@ Demo.BorderLayout = BI.inherit(BI.Widget, {
         }
     }
 });
-BI.shortcut("demo.border", Demo.BorderLayout);Demo.CenterAdapt = BI.inherit(BI.Widget, {
+BI.shortcut("demo.border", Demo.BorderLayout);/**
+ * Created by User on 2017/3/22.
+ */
+Demo.CenterLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-center"
+    },
+    render: function () {
+        return {
+            type: "bi.center",
+            items: [{
+                type: "bi.label",
+                text: "Center 1，这里虽然设置label的高度30，但是最终影响高度的是center布局",
+                cls: "layout-bg1",
+                whiteSpace: "normal"
+            },{
+                type: "bi.label",
+                text: "Center 2，为了演示label是占满整个的，用了一个whiteSpace:normal",
+                cls: "layout-bg2",
+                whiteSpace: "normal"
+            },{
+                type: "bi.label",
+                text: "Center 3",
+                cls: "layout-bg3"
+            },{
+                type: "bi.label",
+                text: "Center 4",
+                cls: "layout-bg5"
+            }],
+            hgap: 20,
+            vgap: 20
+        }
+    }
+});
+BI.shortcut("demo.center_layout", Demo.CenterLayout);Demo.CenterAdapt = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-absolute"
     },
@@ -4570,40 +4604,6 @@ BI.shortcut("demo.border", Demo.BorderLayout);Demo.CenterAdapt = BI.inherit(BI.W
 BI.shortcut("demo.center_adapt", Demo.CenterAdapt);/**
  * Created by User on 2017/3/22.
  */
-Demo.CenterLayout = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-center"
-    },
-    render: function () {
-        return {
-            type: "bi.center",
-            items: [{
-                type: "bi.label",
-                text: "Center 1，这里虽然设置label的高度30，但是最终影响高度的是center布局",
-                cls: "layout-bg1",
-                whiteSpace: "normal"
-            },{
-                type: "bi.label",
-                text: "Center 2，为了演示label是占满整个的，用了一个whiteSpace:normal",
-                cls: "layout-bg2",
-                whiteSpace: "normal"
-            },{
-                type: "bi.label",
-                text: "Center 3",
-                cls: "layout-bg3"
-            },{
-                type: "bi.label",
-                text: "Center 4",
-                cls: "layout-bg5"
-            }],
-            hgap: 20,
-            vgap: 20
-        }
-    }
-});
-BI.shortcut("demo.center_layout", Demo.CenterLayout);/**
- * Created by User on 2017/3/22.
- */
 Demo.FloatCenterLayout = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-float-center"
@@ -4848,6 +4848,55 @@ Demo.GridLayout = BI.inherit(BI.Widget, {
     }
 });
 BI.shortcut("demo.grid", Demo.GridLayout);/**
+ * Created by User on 2017/3/21.
+ */
+Demo.Horizontal = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-horizontal"
+    },
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.horizontal",
+                items: [{
+                    type: "bi.absolute",
+                    items: [{
+                        el: {
+                            type: "bi.text_button",
+                            cls: "layout-bg1",
+                            text: "这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)",
+                            height: 30
+                        },
+                        left: 0,
+                        right: 0
+                    }],
+                    width: 100,
+                    height: 30
+                }, {
+                    type: "bi.absolute",
+                    items: [{
+                        el: {
+                            type: "bi.text_button",
+                            cls: "layout-bg2",
+                            text: "这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)",
+                            height: 30
+                        },
+                        left: 0,
+                        right: 0
+                    }],
+                    width: 200,
+                    height: 30
+                }]
+            }],
+            lgap: 20,
+            rgap: 80,
+            tgap: 80,
+            bgap: 50
+        }
+    }
+});
+BI.shortcut("demo.horizontal", Demo.Horizontal);/**
  * Created by User on 2017/3/22.
  */
 Demo.HorizontalAdapt = BI.inherit(BI.Widget, {
@@ -4964,55 +5013,6 @@ Demo.HorizontalFloat = BI.inherit(BI.Widget, {
     }
 });
 BI.shortcut("demo.horizontal_float", Demo.HorizontalFloat);/**
- * Created by User on 2017/3/21.
- */
-Demo.Horizontal = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-horizontal"
-    },
-    render: function () {
-        return {
-            type: "bi.vertical",
-            items: [{
-                type: "bi.horizontal",
-                items: [{
-                    type: "bi.absolute",
-                    items: [{
-                        el: {
-                            type: "bi.text_button",
-                            cls: "layout-bg1",
-                            text: "这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)",
-                            height: 30
-                        },
-                        left: 0,
-                        right: 0
-                    }],
-                    width: 100,
-                    height: 30
-                }, {
-                    type: "bi.absolute",
-                    items: [{
-                        el: {
-                            type: "bi.text_button",
-                            cls: "layout-bg2",
-                            text: "这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)",
-                            height: 30
-                        },
-                        left: 0,
-                        right: 0
-                    }],
-                    width: 200,
-                    height: 30
-                }]
-            }],
-            lgap: 20,
-            rgap: 80,
-            tgap: 80,
-            bgap: 50
-        }
-    }
-});
-BI.shortcut("demo.horizontal", Demo.Horizontal);/**
  * Created by User on 2017/3/22.
  */
 Demo.HtapeLayout = BI.inherit(BI.Widget, {
@@ -5358,6 +5358,30 @@ Demo.TdLayout = BI.inherit(BI.Widget, {
     }
 });
 BI.shortcut("demo.td", Demo.TdLayout);/**
+ * Created by User on 2017/3/21.
+ */
+Demo.VerticalLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-vertical"
+    },
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.label",
+                cls: "layout-bg1",
+                text: "这里设置了hgap(水平间距)，vgap(垂直间距)",
+                height: 30
+            }, {
+                type: "bi.label",
+                cls: "layout-bg2",
+                text: "这里设置了hgap(水平间距)，vgap(垂直间距)",
+                height: 30
+            }]
+        }
+    }
+});
+BI.shortcut("demo.vertical", Demo.VerticalLayout);/**
  * Created by User on 2017/3/22.
  */
 Demo.VerticalAdaptLayout = BI.inherit(BI.Widget, {
@@ -5399,30 +5423,6 @@ Demo.VerticalAdaptLayout = BI.inherit(BI.Widget, {
     }
 });
 BI.shortcut("demo.vertical_adapt", Demo.VerticalAdaptLayout);/**
- * Created by User on 2017/3/21.
- */
-Demo.VerticalLayout = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-vertical"
-    },
-    render: function () {
-        return {
-            type: "bi.vertical",
-            items: [{
-                type: "bi.label",
-                cls: "layout-bg1",
-                text: "这里设置了hgap(水平间距)，vgap(垂直间距)",
-                height: 30
-            }, {
-                type: "bi.label",
-                cls: "layout-bg2",
-                text: "这里设置了hgap(水平间距)，vgap(垂直间距)",
-                height: 30
-            }]
-        }
-    }
-});
-BI.shortcut("demo.vertical", Demo.VerticalLayout);/**
  * Created by User on 2017/3/22.
  */
 Demo.VtapeLayout = BI.inherit(BI.Widget, {

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) {

dist/widget.css

@@ -171,6 +171,45 @@
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
+.bi-multidate-combo {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-multidate-popup .bi-multidate-popup-label {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+.bi-multidate-popup .bi-multidate-popup-item:active,
+.bi-multidate-popup .bi-multidate-popup-item.active {
+  background-color: #3f8ce8;
+  color: #ffffff;
+  -webkit-border-radius: 2px 2px 0 0;
+  -moz-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+}
+.bi-multidate-popup .bi-multidate-popup-button {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-multidate-segment .bi-multidate-editor {
+  font-size: 14px;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }
@@ -390,6 +429,30 @@
   box-sizing: border-box;
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.bi-single-slider-slider .slider-button {
+  cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  border-radius: 7px;
+}
+.bi-slider-track .gray-track {
+  background-color: rgba(153, 153, 153, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-slider-track .blue-track {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-slider .bi-slider-track {
@@ -399,6 +462,12 @@
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+.bi-param-time-interval.time-error .bi-input {
+  color: #e85050;
+}
+.bi-param-time-interval.time-error .sign-editor-text {
+  color: #e85050;
+}
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-popup .year-popup-navigation {

src/addons/slider/slider/singleslider/singleslider.js

@@ -13,7 +13,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 () {
@@ -92,7 +92,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,
@@ -184,7 +184,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) {

src/css/widget/multidate/multidate.combo.css

@@ -0,0 +1,5 @@
+.bi-multidate-combo {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}

src/css/widget/multidate/multidate.day.css

@@ -0,0 +1,3 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/

src/css/widget/multidate/multidate.month.css

@@ -0,0 +1,3 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/

src/css/widget/multidate/multidate.popup.css

@@ -0,0 +1,16 @@
+.bi-multidate-popup .bi-multidate-popup-label {
+  color: #3f8ce8;
+  font-size: 14px;
+}
+.bi-multidate-popup .bi-multidate-popup-item:active,
+.bi-multidate-popup .bi-multidate-popup-item.active {
+  background-color: #3f8ce8;
+  color: #ffffff;
+  -webkit-border-radius: 2px 2px 0 0;
+  -moz-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+}
+.bi-multidate-popup .bi-multidate-popup-button {
+  color: #3f8ce8;
+  font-size: 14px;
+}

src/css/widget/multidate/multidate.quarter.css

@@ -0,0 +1,3 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/

src/css/widget/multidate/multidate.segment.css

@@ -0,0 +1,3 @@
+.bi-multidate-segment .bi-multidate-editor {
+  font-size: 14px;
+}

src/css/widget/multidate/multidate.week.css

@@ -0,0 +1,3 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/

src/css/widget/multidate/multidate.year.css

@@ -0,0 +1,3 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/

src/css/widget/singleslider/singleslider.css

@@ -0,0 +1,3 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/

src/css/widget/singleslider/slider/widget.slider.css

@@ -0,0 +1,9 @@
+.bi-single-slider-slider .slider-button {
+  cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  border-radius: 7px;
+}

src/css/widget/singleslider/track/widget.track.css

@@ -0,0 +1,12 @@
+.bi-slider-track .gray-track {
+  background-color: rgba(153, 153, 153, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-slider-track .blue-track {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}

src/css/widget/timeinterval/timeinterval.css

@@ -0,0 +1,6 @@
+.bi-param-time-interval.time-error .bi-input {
+  color: #e85050;
+}
+.bi-param-time-interval.time-error .sign-editor-text {
+  color: #e85050;
+}

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;

src/less/var.less

@@ -1,13 +1,14 @@
-@webUrl: '';
+@webUrl: '${remoteServletURL}?op=resource&resource=/com/fr/bi/web/';
-@imageUrl: 'images/1x/'; //图片的基本地址
+@imageUrl: '${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/'; //图片的基本地址
-@image2xUrl: 'images/2x/'; //图片的基本地址
+@image2xUrl: '${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/2x/'; //2x图片的基本地址
 
-@cursor: '@{webUrl}cursor/cursor_hand.cur';
+@cursor: '@{webUrl}images/cursor/cursor_hand.cur';
-@dragCursor: '@{webUrl}cursor/cursor_drag_hand.cur';
+@dragCursor: '@{webUrl}images/cursor/cursor_drag_hand.cur';
-@leftRightCursor:'@{webUrl}cursor/cursor_left_right.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;

src/less/widget/multidate/multidate.combo.less

@@ -0,0 +1,5 @@
+@import "../../bibase";
+
+.bi-multidate-combo{
+  .border-radius(2px);
+}

src/less/widget/multidate/multidate.day.less

@@ -0,0 +1,6 @@
+@import "../../bibase";
+
+.bi-multidate-daycard{
+  & .bi-multidate-inner-label{
+  }
+}

src/less/widget/multidate/multidate.month.less

@@ -0,0 +1,6 @@
+@import "../../bibase";
+
+.bi-multidate-monthcard{
+  & .bi-multidate-inner-label{
+  }
+}

src/less/widget/multidate/multidate.popup.less

@@ -0,0 +1,23 @@
+@import "../../bibase";
+
+.bi-multidate-popup{
+
+  & .bi-multidate-popup-label {
+    color:@color-bi-text-highlight;
+    font-size:@font-size-14;
+  }
+  & .bi-multidate-popup-tab {
+  }
+  & .bi-multidate-popup-item{
+    &:active,&.active{
+      background-color: @color-bi-text-highlight;
+      color: @color-bi-background-default;
+      .border-corner-radius(@radius-2,@radius-2,0,0);
+    }
+  }
+
+  & .bi-multidate-popup-button{
+    color:@color-bi-text-highlight;
+    font-size:@font-size-14;
+  }
+}

src/less/widget/multidate/multidate.quarter.less

@@ -0,0 +1,6 @@
+@import "../../bibase";
+
+.bi-multidate-quartercard{
+  & .bi-multidate-inner-label{
+  }
+}

src/less/widget/multidate/multidate.segment.less

@@ -0,0 +1,9 @@
+@import "../../bibase";
+
+.bi-multidate-segment{
+  & .bi-multidate-normal-label{
+  }
+  & .bi-multidate-editor{
+    font-size: @font-size-14;
+  }
+}

src/less/widget/multidate/multidate.week.less

@@ -0,0 +1,6 @@
+@import "../../bibase";
+
+.bi-multidate-weekcard{
+  & .bi-multidate-inner-label{
+  }
+}

src/less/widget/multidate/multidate.year.less

@@ -0,0 +1,6 @@
+@import "../../bibase";
+
+.bi-multidate-yearcard{
+  & .bi-multidate-inner-label{
+  }
+}

src/less/widget/singleslider/singleslider.less

@@ -0,0 +1,6 @@
+@import "../../bibase";
+
+.bi-single-slider {
+  & .slider-editor-button {
+  }
+}

src/less/widget/singleslider/slider/widget.slider.less

@@ -0,0 +1,8 @@
+@import "../../../bibase";
+.bi-single-slider-slider{
+  & .slider-button{
+    cursor: url(@sliderDragCursor), auto;
+    .box-shadow(0 0 10px, rgba(0, 0, 0, 0.2));
+    .border-radius(7px);
+  }
+}

src/less/widget/singleslider/track/widget.track.less

@@ -0,0 +1,11 @@
+@import "../../../bibase";
+
+.bi-slider-track {
+  .gray-track {
+    .background-color(@color-bi-background-gray, 30%);
+    .border-radius(3px);
+  }
+  .blue-track {
+    .border-radius(3px);
+  }
+}

src/less/widget/timeinterval/timeinterval.less

@@ -0,0 +1,10 @@
+@import "../../bibase";
+
+.bi-param-time-interval{
+  &.time-error .bi-input{
+    color:@color-bi-text-warning
+  }
+  &.time-error .sign-editor-text{
+    color:@color-bi-text-warning
+  }
+}