add

Gruntfile.js

@@ -87,6 +87,12 @@ module.exports = function (grunt) {
                 ],
                 dest: 'dist/slider.js'
             },
+            sliderCss: {
+                src: [
+                    'src/addons/slider/**/*.css'
+                ],
+                dest: 'dist/slider.css'
+            },
             jqueryuiJs: {
                 src: [
                     'src/addons/slider/lib/jquery.ui.core.js',
@@ -234,6 +240,12 @@ module.exports = function (grunt) {
                 ],
                 dest: 'bi/slider.js'
             },
+            bi_sliderCss: {
+                src: [
+                    'src/addons/slider/**/*.css'
+                ],
+                dest: 'bi/slider.css'
+            },
             bi_jqueryuiJs: {
                 src: [
                     'src/addons/slider/lib/jquery.ui.core.js',

bi/base.css

@@ -617,7 +617,7 @@ li.CodeMirror-hint-active {
 .bi-direction-pager .direction-pager-next {
   font-size: 16px;
 }
-.bi-text-toolbar .text-toolbar-button {
+.bi-rich-editor-text-toolbar .text-toolbar-button {
   font-size: 16px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/

bi/base.js

@@ -16169,7 +16169,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
 BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-toolbar bi-background",
+            baseCls: "bi-rich-editor-text-toolbar bi-background",
             buttons: [
                 {type: "bi.rich_editor_size_chooser"},
                 {type: "bi.rich_editor_bold_button"},
@@ -16237,7 +16237,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
         _init: function () {
             BI.NicEditor.superclass._init.apply(this, arguments);
             var o = this.options;
-            $(document.body).mousedown(BI.bind(this.selectCheck, this));
+            $(document).bind("mousedown." + this.getName(), BI.bind(this.selectCheck, this));
             BI.createWidget({
                 type: "bi.vertical",
                 element: this,
@@ -16273,7 +16273,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
             var t = e.target;
             var found = false;
             do {
-                if (t.className && t.className.indexOf(prefix) != -1) {
+                if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
                     return;
                     // return false;
                 }
@@ -16290,6 +16290,10 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
 
         getValue: function () {
             return this.instance.getContent();
+        },
+
+        destroyed: function () {
+            $(document).unbind("mousedown." + this.getName());
         }
     });
     BI.NicEditor.EVENT_SELECTED = "selected";
@@ -16936,8 +16940,8 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             el: this.trigger,
             adjustLength: 1,
             popup: {
-                maxWidth: o.width,
+                maxWidth: 70,
-                minWidth: o.width,
+                minWidth: 70,
                 el: {
                     type: "bi.button_group",
                     items: BI.createItems(this._items, {
@@ -16967,7 +16971,8 @@ BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/**
 BI.RichEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-rich-editor bi-card"
+            baseCls: "bi-rich-editor bi-card",
+            toolbar: {}
         });
     },
     _init: function () {
@@ -16983,11 +16988,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
         });
 
-        this.toolbar = BI.createWidget({
-            type: "bi.rich_editor_text_toolbar",
-            editor: this.editor
-        });
-
         this.combo = BI.createWidget({
             type: "bi.combo",
             element: this,
@@ -16998,7 +16998,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             adjustLength: 1,
             el: this.editor,
             popup: {
-                el: this.toolbar,
+                el: BI.extend({
+                    type: "bi.rich_editor_text_toolbar",
+                    editor: this.editor
+                }, o.toolbar),
                 height: 30,
                 stopPropagation: true,
                 stopEvent: true

bi/widget.css

@@ -429,39 +429,8 @@
   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('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 {
-  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-param-time-interval.time-error .bi-input {
   color: #e85050;
 }

dist/base.css

@@ -617,7 +617,7 @@ li.CodeMirror-hint-active {
 .bi-direction-pager .direction-pager-next {
   font-size: 16px;
 }
-.bi-text-toolbar .text-toolbar-button {
+.bi-rich-editor-text-toolbar .text-toolbar-button {
   font-size: 16px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/

dist/base.js

@@ -16169,7 +16169,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
 BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-toolbar bi-background",
+            baseCls: "bi-rich-editor-text-toolbar bi-background",
             buttons: [
                 {type: "bi.rich_editor_size_chooser"},
                 {type: "bi.rich_editor_bold_button"},
@@ -16237,7 +16237,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
         _init: function () {
             BI.NicEditor.superclass._init.apply(this, arguments);
             var o = this.options;
-            $(document.body).mousedown(BI.bind(this.selectCheck, this));
+            $(document).bind("mousedown." + this.getName(), BI.bind(this.selectCheck, this));
             BI.createWidget({
                 type: "bi.vertical",
                 element: this,
@@ -16273,7 +16273,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
             var t = e.target;
             var found = false;
             do {
-                if (t.className && t.className.indexOf(prefix) != -1) {
+                if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
                     return;
                     // return false;
                 }
@@ -16290,6 +16290,10 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
 
         getValue: function () {
             return this.instance.getContent();
+        },
+
+        destroyed: function () {
+            $(document).unbind("mousedown." + this.getName());
         }
     });
     BI.NicEditor.EVENT_SELECTED = "selected";
@@ -16936,8 +16940,8 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             el: this.trigger,
             adjustLength: 1,
             popup: {
-                maxWidth: o.width,
+                maxWidth: 70,
-                minWidth: o.width,
+                minWidth: 70,
                 el: {
                     type: "bi.button_group",
                     items: BI.createItems(this._items, {
@@ -16967,7 +16971,8 @@ BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/**
 BI.RichEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-rich-editor bi-card"
+            baseCls: "bi-rich-editor bi-card",
+            toolbar: {}
         });
     },
     _init: function () {
@@ -16983,11 +16988,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
         });
 
-        this.toolbar = BI.createWidget({
-            type: "bi.rich_editor_text_toolbar",
-            editor: this.editor
-        });
-
         this.combo = BI.createWidget({
             type: "bi.combo",
             element: this,
@@ -16998,7 +16998,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             adjustLength: 1,
             el: this.editor,
             popup: {
-                el: this.toolbar,
+                el: BI.extend({
+                    type: "bi.rich_editor_text_toolbar",
+                    editor: this.editor
+                }, o.toolbar),
                 height: 30,
                 stopPropagation: true,
                 stopEvent: true

dist/bundle.css

@@ -2197,7 +2197,7 @@ li.CodeMirror-hint-active {
 .bi-direction-pager .direction-pager-next {
   font-size: 16px;
 }
-.bi-text-toolbar .text-toolbar-button {
+.bi-rich-editor-text-toolbar .text-toolbar-button {
   font-size: 16px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
@@ -3285,39 +3285,8 @@ 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('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 {
-  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-param-time-interval.time-error .bi-input {
   color: #e85050;
 }
@@ -3486,6 +3455,10 @@ textarea::-webkit-scrollbar-thumb:hover {
   
   /*  iOS 4.1- */
 }
+@font-face {
+  font-family: 'bi';
+  src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot') /* IE6-IE8 */;
+}
 .b-font {
   font-family: "bi";
   font-style: normal;
@@ -4212,6 +4185,114 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e636";
   color: inherit;
 }
+.text-bold-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-bold-font .b-font:before {
+  content: "\e64d";
+  color: inherit;
+}
+.text-bold-font.native .b-font:before,
+.text-bold-font.disabled .b-font:before {
+  content: "\e64d";
+  color: inherit;
+}
+.text-italic-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-italic-font .b-font:before {
+  content: "\e656";
+  color: inherit;
+}
+.text-italic-font.native .b-font:before,
+.text-italic-font.disabled .b-font:before {
+  content: "\e656";
+  color: inherit;
+}
+.text-underline-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-underline-font .b-font:before {
+  content: "\e650";
+  color: inherit;
+}
+.text-underline-font.native .b-font:before,
+.text-underline-font.disabled .b-font:before {
+  content: "\e650";
+  color: inherit;
+}
+.text-color-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-color-font .b-font:before {
+  content: "\e69c";
+  color: inherit;
+}
+.text-color-font.native .b-font:before,
+.text-color-font.disabled .b-font:before {
+  content: "\e69c";
+  color: inherit;
+}
+.text-background-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-background-font .b-font:before {
+  content: "\e696";
+  color: inherit;
+}
+.text-background-font.native .b-font:before,
+.text-background-font.disabled .b-font:before {
+  content: "\e696";
+  color: inherit;
+}
+.text-color-underline-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-color-underline-font .b-font:before {
+  content: "\e69d";
+  color: inherit;
+}
+.text-color-underline-font.native .b-font:before,
+.text-color-underline-font.disabled .b-font:before {
+  content: "\e69d";
+  color: inherit;
+}
+.text-align-left-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-align-left-font .b-font:before {
+  content: "\e654";
+  color: inherit;
+}
+.text-align-left-font.native .b-font:before,
+.text-align-left-font.disabled .b-font:before {
+  content: "\e654";
+  color: inherit;
+}
+.text-align-center-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-align-center-font .b-font:before {
+  content: "\e64f";
+  color: inherit;
+}
+.text-align-center-font.native .b-font:before,
+.text-align-center-font.disabled .b-font:before {
+  content: "\e64f";
+  color: inherit;
+}
+.text-align-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-align-right-font .b-font:before {
+  content: "\e651";
+  color: inherit;
+}
+.text-align-right-font.native .b-font:before,
+.text-align-right-font.disabled .b-font:before {
+  content: "\e651";
+  color: inherit;
+}
 .tree-collapse-icon-type1 .x-icon,
 .tree-collapse-icon-type1:hover .x-icon,
 .tree-collapse-icon-type1:active .x-icon {

dist/bundle.js

@@ -44975,7 +44975,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
 BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-toolbar bi-background",
+            baseCls: "bi-rich-editor-text-toolbar bi-background",
             buttons: [
                 {type: "bi.rich_editor_size_chooser"},
                 {type: "bi.rich_editor_bold_button"},
@@ -45043,7 +45043,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
         _init: function () {
             BI.NicEditor.superclass._init.apply(this, arguments);
             var o = this.options;
-            $(document.body).mousedown(BI.bind(this.selectCheck, this));
+            $(document).bind("mousedown." + this.getName(), BI.bind(this.selectCheck, this));
             BI.createWidget({
                 type: "bi.vertical",
                 element: this,
@@ -45079,7 +45079,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
             var t = e.target;
             var found = false;
             do {
-                if (t.className && t.className.indexOf(prefix) != -1) {
+                if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
                     return;
                     // return false;
                 }
@@ -45096,6 +45096,10 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
 
         getValue: function () {
             return this.instance.getContent();
+        },
+
+        destroyed: function () {
+            $(document).unbind("mousedown." + this.getName());
         }
     });
     BI.NicEditor.EVENT_SELECTED = "selected";
@@ -45742,8 +45746,8 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             el: this.trigger,
             adjustLength: 1,
             popup: {
-                maxWidth: o.width,
+                maxWidth: 70,
-                minWidth: o.width,
+                minWidth: 70,
                 el: {
                     type: "bi.button_group",
                     items: BI.createItems(this._items, {
@@ -45773,7 +45777,8 @@ BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/**
 BI.RichEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-rich-editor bi-card"
+            baseCls: "bi-rich-editor bi-card",
+            toolbar: {}
         });
     },
     _init: function () {
@@ -45789,11 +45794,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
         });
 
-        this.toolbar = BI.createWidget({
-            type: "bi.rich_editor_text_toolbar",
-            editor: this.editor
-        });
-
         this.combo = BI.createWidget({
             type: "bi.combo",
             element: this,
@@ -45804,7 +45804,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             adjustLength: 1,
             el: this.editor,
             popup: {
-                el: this.toolbar,
+                el: BI.extend({
+                    type: "bi.rich_editor_text_toolbar",
+                    editor: this.editor
+                }, o.toolbar),
                 height: 30,
                 stopPropagation: true,
                 stopEvent: true

dist/widget.css

@@ -429,39 +429,8 @@
   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('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 {
-  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-param-time-interval.time-error .bi-input {
   color: #e85050;
 }

public/css/font.css

@@ -4,6 +4,10 @@
   
   /*  iOS 4.1- */
 }
+@font-face {
+  font-family: 'bi';
+  src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot') /* IE6-IE8 */;
+}
 .b-font {
   font-family: "bi";
   font-style: normal;
@@ -730,3 +734,111 @@
   content: "\e636";
   color: inherit;
 }
+.text-bold-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-bold-font .b-font:before {
+  content: "\e64d";
+  color: inherit;
+}
+.text-bold-font.native .b-font:before,
+.text-bold-font.disabled .b-font:before {
+  content: "\e64d";
+  color: inherit;
+}
+.text-italic-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-italic-font .b-font:before {
+  content: "\e656";
+  color: inherit;
+}
+.text-italic-font.native .b-font:before,
+.text-italic-font.disabled .b-font:before {
+  content: "\e656";
+  color: inherit;
+}
+.text-underline-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-underline-font .b-font:before {
+  content: "\e650";
+  color: inherit;
+}
+.text-underline-font.native .b-font:before,
+.text-underline-font.disabled .b-font:before {
+  content: "\e650";
+  color: inherit;
+}
+.text-color-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-color-font .b-font:before {
+  content: "\e69c";
+  color: inherit;
+}
+.text-color-font.native .b-font:before,
+.text-color-font.disabled .b-font:before {
+  content: "\e69c";
+  color: inherit;
+}
+.text-background-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-background-font .b-font:before {
+  content: "\e696";
+  color: inherit;
+}
+.text-background-font.native .b-font:before,
+.text-background-font.disabled .b-font:before {
+  content: "\e696";
+  color: inherit;
+}
+.text-color-underline-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-color-underline-font .b-font:before {
+  content: "\e69d";
+  color: inherit;
+}
+.text-color-underline-font.native .b-font:before,
+.text-color-underline-font.disabled .b-font:before {
+  content: "\e69d";
+  color: inherit;
+}
+.text-align-left-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-align-left-font .b-font:before {
+  content: "\e654";
+  color: inherit;
+}
+.text-align-left-font.native .b-font:before,
+.text-align-left-font.disabled .b-font:before {
+  content: "\e654";
+  color: inherit;
+}
+.text-align-center-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-align-center-font .b-font:before {
+  content: "\e64f";
+  color: inherit;
+}
+.text-align-center-font.native .b-font:before,
+.text-align-center-font.disabled .b-font:before {
+  content: "\e64f";
+  color: inherit;
+}
+.text-align-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-align-right-font .b-font:before {
+  content: "\e651";
+  color: inherit;
+}
+.text-align-right-font.native .b-font:before,
+.text-align-right-font.disabled .b-font:before {
+  content: "\e651";
+  color: inherit;
+}

public/less/var.less

@@ -1,3 +1,3 @@
 @webUrl: 'https://fanruan.coding.me/fineui/dist/';
 @imageUrl: '@{webUrl}images/1x/'; //图片的基本地址
-@image2xUrl: '@{webUrl}images/2x/'; //图片的基本地址
+@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址

src/addons/slider/less/singleslider/singleslider.less

@@ -1,4 +1,4 @@
-@import "../../bibase";
+@import "../../../../less/bibase";
 
 .bi-single-slider {
   & .slider-editor-button {

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

@@ -1,7 +1,6 @@
-@import "../../../bibase";
+@import "../../../../../less/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/addons/slider/less/singleslider/track/widget.track.less

@@ -1,4 +1,4 @@
-@import "../../../bibase";
+@import "../../../../../less/bibase";
 
 .bi-slider-track {
   .gray-track {

src/base/richeditor/bar/texttoolbar.js

@@ -8,7 +8,7 @@
 BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-toolbar bi-background",
+            baseCls: "bi-rich-editor-text-toolbar bi-background",
             buttons: [
                 {type: "bi.rich_editor_size_chooser"},
                 {type: "bi.rich_editor_bold_button"},

src/base/richeditor/niceditor/niceditor.js

@@ -15,7 +15,7 @@
         _init: function () {
             BI.NicEditor.superclass._init.apply(this, arguments);
             var o = this.options;
-            $(document.body).mousedown(BI.bind(this.selectCheck, this));
+            $(document).bind("mousedown." + this.getName(), BI.bind(this.selectCheck, this));
             BI.createWidget({
                 type: "bi.vertical",
                 element: this,
@@ -51,7 +51,7 @@
             var t = e.target;
             var found = false;
             do {
-                if (t.className && t.className.indexOf(prefix) != -1) {
+                if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
                     return;
                     // return false;
                 }
@@ -68,6 +68,10 @@
 
         getValue: function () {
             return this.instance.getContent();
+        },
+
+        destroyed: function () {
+            $(document).unbind("mousedown." + this.getName());
         }
     });
     BI.NicEditor.EVENT_SELECTED = "selected";

src/base/richeditor/plugins/combo.sizechooser.js

@@ -52,8 +52,8 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             el: this.trigger,
             adjustLength: 1,
             popup: {
-                maxWidth: o.width,
+                maxWidth: 70,
-                minWidth: o.width,
+                minWidth: 70,
                 el: {
                     type: "bi.button_group",
                     items: BI.createItems(this._items, {

src/base/richeditor/richeditor.js

@@ -8,7 +8,8 @@
 BI.RichEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-rich-editor bi-card"
+            baseCls: "bi-rich-editor bi-card",
+            toolbar: {}
         });
     },
     _init: function () {
@@ -24,11 +25,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
         });
 
-        this.toolbar = BI.createWidget({
-            type: "bi.rich_editor_text_toolbar",
-            editor: this.editor
-        });
-
         this.combo = BI.createWidget({
             type: "bi.combo",
             element: this,
@@ -39,7 +35,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             adjustLength: 1,
             el: this.editor,
             popup: {
-                el: this.toolbar,
+                el: BI.extend({
+                    type: "bi.rich_editor_text_toolbar",
+                    editor: this.editor
+                }, o.toolbar),
                 height: 30,
                 stopPropagation: true,
                 stopEvent: true

src/css/base/richeditor/texttoolbar/texttoolbar.css

@@ -1,3 +1,3 @@
-.bi-text-toolbar .text-toolbar-button {
+.bi-rich-editor-text-toolbar .text-toolbar-button {
   font-size: 16px;
 }

src/css/widget/singleslider/singleslider.css

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

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

@@ -1,9 +0,0 @@
-.bi-single-slider-slider .slider-button {
-  cursor: url('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

@@ -1,12 +0,0 @@
-.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/slider/slider.css

@@ -1,7 +0,0 @@
-.bi-slider .bi-slider-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;
-}

src/less/base/richeditor/texttoolbar/alignchooser/texttoolbar.alignchooser.less

@@ -1,5 +0,0 @@
-@import "../../../../bibase";
-.bi-text-toolbar-align-chooser{
-  & .align-chooser-button{
-  }
-}

src/less/base/richeditor/texttoolbar/texttoolbar.less

@@ -1,6 +1,6 @@
 @import "../../../bibase";
 
-.bi-text-toolbar {
+.bi-rich-editor-text-toolbar {
   & .text-toolbar-button {
     font-size: @font-size-16;
   }

src/less/widget/slider/slider.less

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