update

bi/base.js

@@ -14351,15 +14351,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
 
     _checkWaterMark: function () {
         var o = this.options;
-        if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
+        if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
             this.watermark && this.watermark.visible();
         } else {
             this.watermark && this.watermark.invisible();
         }
     },
 
-    disableWarterMark: function () {
+    disableWaterMark: function () {
-        this.disabledWarterMark = true;
+        this.disabledWaterMark = true;
         this._checkWaterMark();
     },
 
@@ -18111,7 +18111,7 @@ BI.Editor = BI.inherit(BI.Single, {
 
     _checkWaterMark: function () {
         var o = this.options;
-        if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
+        if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
             this.watermark && this.watermark.visible();
         } else {
             this.watermark && this.watermark.invisible();
@@ -18149,13 +18149,13 @@ BI.Editor = BI.inherit(BI.Single, {
         this._checkError();
     },
 
-    disableWarterMark: function () {
+    disableWaterMark: function () {
-        this.disabledWarterMark = true;
+        this.disabledWaterMark = true;
         this._checkWaterMark();
     },
 
-    enableWarterMark: function () {
+    enableWaterMark: function () {
-        this.disabledWarterMark = false;
+        this.disabledWaterMark = false;
         this._checkWaterMark();
     },
 
@@ -18489,6 +18489,9 @@ BI.Icon = BI.inherit(BI.Single, {
     },
     _init: function () {
         BI.Icon.superclass._init.apply(this, arguments);
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     }
 });
 BI.shortcut("bi.icon", BI.Icon);/**
@@ -30100,6 +30103,41 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
+        this.topLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.topRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+
+        function overscan(grid, w, h, rSize, cSize) {
+            var rCount = h / rSize;
+            var cCount = w / cSize;
+            if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
+                grid.attr("overscanRowCount", 100);
+                grid.attr("overscanColumnCount", 100);
+            }
+        }
+
+        if (freezeColLength > 0) {
+            overscan(this.topLeftGrid, tlw, tlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
+            overscan(this.bottomLeftGrid, blw, blh, o.rowSize, totalLeftColumnSize / freezeColLength);
+        }
+        if (o.columnSize.length - freezeColLength > 0) {
+            overscan(this.topRight, trw, trh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+            overscan(this.bottomRightGrid, brw, brh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+        }
+
         this.topLeftGrid._populate(this.header[0]);
         this.topRightGrid._populate(this.header[1]);
         this.bottomLeftGrid._populate(this.items[0]);
@@ -30326,7 +30364,8 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
     _populateTable: function () {
         var self = this, o = this.options;
-        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [];
+        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
+            summaryColumnSizeArray = [];
         var freezeColLength = this._getFreezeColLength();
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@@ -30417,6 +30456,42 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
                 }
             });
         });
+
+        this.topLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.topRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+
+        function overscan(grid, w, h, rSize, cSize) {
+            var rCount = h / rSize;
+            var cCount = w / cSize;
+            if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
+                grid.attr("overscanRowCount", 100);
+                grid.attr("overscanColumnCount", 100);
+            }
+        }
+
+        if (freezeColLength > 0) {
+            overscan(this.topLeftGrid, otlw, otlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
+            overscan(this.bottomLeftGrid, oblw, oblh, o.rowSize, totalLeftColumnSize / freezeColLength);
+        }
+        if (o.columnSize.length - freezeColLength > 0) {
+            overscan(this.topRight, otrw, otrh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+            overscan(this.bottomRightGrid, obrw, obrh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+        }
+
         this.topLeftGrid.populate(leftHeader);
         this.topRightGrid.populate(rightHeader);
         this.bottomLeftGrid.populate(leftItems);
@@ -31291,8 +31366,8 @@ BI.Table = BI.inherit(BI.Widget, {
                         var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
                         if (isNeedMergeCol === true) {
                             mergeCol(i, j);
-                            preCol[j] = preRow[j - 1];
+                            preCol[j] = preRow[i];
-                            preCW[j] = preRW[j - 1];
+                            preCW[j] = preRW[i];
                         } else {
                             createOneEl(i, j);
                         }

bi/case.js

@@ -6903,9 +6903,7 @@ BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
 BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
 
 BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
- * sign是新值（初始value值）形式的自适应宽度的输入框
+ * Created by User on 2017/7/28.
- * @class BI.SignInitialEditor
- * @extends BI.Single
  */
 BI.SignInitialEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
@@ -6934,8 +6932,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         BI.SignInitialEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget({
-            type: "bi.sign_editor",
+            type: "bi.editor",
-            element: this,
             height: o.height,
             hgap: o.hgap,
             vgap: o.vgap,
@@ -6943,7 +6940,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
-            value: o.value || o.text,
+            value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
             mouseOut: o.mouseOut,
@@ -6951,67 +6948,163 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             errorText: o.errorText
         });
-        if(BI.isNotNull(o.value)){
+        this.text = BI.createWidget({
-            this.setState(o.value);
+            type: "bi.text_button",
+            cls: "sign-editor-text",
+            title: o.title,
+            warningTitle: o.warningTitle,
+            tipType: o.tipType,
+            textAlign: "left",
+            height: o.height,
+            hgap: 4,
+            handler: function () {
+                self._showInput();
+                self.editor.focus();
+                self.editor.selectAll();
             }
+        });
+        this.text.on(BI.TextButton.EVENT_CHANGE, function () {
+            BI.nextTick(function () {
+                self.fireEvent(BI.SignInitialEditor.EVENT_CLICK_LABEL)
+            });
+        });
+        BI.createWidget({
+            type: "bi.absolute",
+            element: this,
+            items: [{
+                el: this.text,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            }]
+        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+        this.editor.on(BI.Editor.EVENT_FOCUS, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS);
+            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_BLUR, function () {
+        this.editor.on(BI.Editor.EVENT_BLUR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR);
+            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CLICK, function () {
+        this.editor.on(BI.Editor.EVENT_CLICK, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CHANGE, function () {
+        this.editor.on(BI.Editor.EVENT_CHANGE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function (v) {
+        this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) {
-            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN);
+            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN, arguments);
         });
 
-        this.editor.on(BI.SignEditor.EVENT_VALID, function () {
+        this.editor.on(BI.Editor.EVENT_VALID, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_VALID);
+            self.fireEvent(BI.SignInitialEditor.EVENT_VALID, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CONFIRM, function () {
+        this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
-            self.setState(self.editor.getValue());
+            self._showHint();
-            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_START, function () {
+        this.editor.on(BI.Editor.EVENT_START, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_START);
+            self.fireEvent(BI.SignInitialEditor.EVENT_START, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_PAUSE, function () {
+        this.editor.on(BI.Editor.EVENT_PAUSE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_STOP, function () {
+        this.editor.on(BI.Editor.EVENT_STOP, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_STOP);
+            self.fireEvent(BI.SignInitialEditor.EVENT_STOP, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_SPACE, function () {
+        this.editor.on(BI.Editor.EVENT_SPACE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ERROR, function () {
+        this.editor.on(BI.Editor.EVENT_ERROR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ENTER, function () {
+        this.editor.on(BI.Editor.EVENT_ENTER, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER);
+            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_RESTRICT, function () {
+        this.editor.on(BI.Editor.EVENT_RESTRICT, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT);
+            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT, arguments);
+        });
+        this.editor.on(BI.Editor.EVENT_EMPTY, function () {
+            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_EMPTY, function () {
+        BI.createWidget({
-            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY);
+            type: "bi.vertical",
+            scrolly: false,
+            element: this,
+            items: [this.editor]
         });
+        this._showHint();
+        self._checkText();
+    },
+
+    _checkText: function () {
+        var o = this.options;
+        BI.nextTick(BI.bind(function () {
+            if (this.editor.getValue() === "") {
+                this.text.setValue(o.watermark || "");
+                this.text.element.addClass("bi-water-mark");
+            } else {
+                var v = this.editor.getValue();
+                v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
+                this.text.setValue(v);
+                this.text.element.removeClass("bi-water-mark");
+            }
+        }, this));
+    },
+
+    _showInput: function () {
+        this.editor.visible();
+        this.text.invisible();
+    },
+
+    _showHint: function () {
+        this.editor.invisible();
+        this.text.visible();
+    },
+
+    setTitle: function (title) {
+        this.text.setTitle(title);
+    },
+
+    setWarningTitle: function (title) {
+        this.text.setWarningTitle(title);
     },
 
     focus: function () {
+        this._showInput();
         this.editor.focus();
     },
 
     blur: function () {
         this.editor.blur();
+        this._showHint();
+        this._checkText();
+    },
+
+    doRedMark: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
     },
 
     isValid: function () {
@@ -7026,9 +7119,19 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         return this.editor.getErrorText();
     },
 
+    isEditing: function () {
+        return this.editor.isEditing();
+    },
+
+    getLastValidValue: function () {
+        return this.editor.getLastValidValue();
+    },
+
     setValue: function (v) {
+        var o = this.options;
         this.editor.setValue(v.value);
-        this.setState(v.value);
+        o.text = v.text || o.text;
+        this._checkText();
     },
 
     getValue: function () {
@@ -7039,13 +7142,14 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
     },
 
     getState: function () {
-        return this.editor.getState();
+        return this.text.getValue();
     },
 
     setState: function (v) {
         var o = this.options;
+        this._showHint();
         v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
-        this.editor.setState(v);
+        this.text.setValue(v);
     }
 });
 BI.SignInitialEditor.EVENT_CHANGE = "EVENT_CHANGE";
@@ -8687,6 +8791,11 @@ BI.SelectList = BI.inherit(BI.Widget, {
         this._checkAllSelected();
     },
 
+    _setEnable: function (enable) {
+        BI.SelectList.superclass._setEnable.apply(this, arguments);
+        this.toolbar.setEnable(enable);
+    },
+
     resetHeight: function (h) {
         var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
         this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :

bi/core.js

@@ -2940,10 +2940,7 @@ if (!window.BI) {
             return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
         },
 
-        isIE9Below: function () {
+        getIEVersion: function () {
-            if (!BI.isIE()) {
-                return false;
-            }
             var version = 0;
             var agent = navigator.userAgent.toLowerCase();
             var v1 = agent.match(/(?:msie\s([\w.]+))/);
@@ -2957,7 +2954,18 @@ if (!window.BI) {
             } else {
                 version = 0;
             }
-            return version < 9;
+            return version;
+        },
+
+        isIE9Below: function () {
+            if (!BI.isIE()) {
+                return false;
+            }
+            return this.getIEVersion() < 9;
+        },
+
+        isIE9: function () {
+            return this.getIEVersion() === 9;
         },
 
         isEdge: function () {
@@ -4672,6 +4680,13 @@ BI.Widget = BI.inherit(BI.OB, {
     },
 
     attr: function (key, value) {
+        var self = this;
+        if (BI.isPlainObject(key)) {
+            BI.each(key, function (k, v) {
+                self.attr(k, v);
+            })
+            return;
+        }
         if (BI.isNotNull(value)) {
             return this.options[key] = value;
         }

bi/widget.js

@@ -629,7 +629,12 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
                     clearInterval(self._scrollInterval);
                     self._scrollInterval = null;
                 }
+                var count = 0;
                 self._scrollInterval = setInterval(function () {
+                    count++;
+                    if (count <= 3) {
+                        return;
+                    }
                     var offset = self._getScrollOffset();
                     var t = offset.top + map[direction][0] * 40;
                     var l = offset.left + map[direction][1] * 40;
@@ -2613,12 +2618,13 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
             month: date.month,
             day: this.selectedTime.day
         });
-        return calendar;
+        return calendar
     },
 
     _init: function () {
         BI.DateCalendarPopup.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
+        var self = this,
+            o = this.options;
         this.today = new Date();
         this._year = this.today.getFullYear();
         this._month = this.today.getMonth();
@@ -2764,7 +2770,8 @@ BI.DateCombo = BI.inherit(BI.Widget, {
     },
     _init: function () {
         BI.DateCombo.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
+        var self = this,
+            o = this.options;
 
         this.trigger = BI.createWidget({
             type: "bi.date_trigger"
@@ -5292,7 +5299,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, {
 
     _const: {
         normal_color: "#ffffff",
-        select_color: "#f4f4f4"
+        select_color: "#eff1f4"
     },
     _defaultConfig: function () {
         return BI.extend(BI.FileManagerNavButton.superclass._defaultConfig.apply(this, arguments), {

demo/css/main.css

@@ -48,3 +48,30 @@ body {
 .demo-editor {
   border: 1px solid #cccccc;
 }
+.demo-clolor {
+  color: #1a1a1a;
+}
+.bi-progress-bar-processor {
+  transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+  background: #3f8ce8;
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
+}
+.bi-progress-text-bar-processor {
+  transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+}
+.bi-progress-bar-bar {
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+}

demo/js/case/editor/demo.sign_initial_editor.js

@@ -5,17 +5,26 @@ Demo.SignInitialEditor = BI.inherit(BI.Widget, {
     props: {
         baseCls: ""
     },
+    mounted: function () {
+        this.editor.setValue({
+            value: "123",
+            text: "sdga"
+        })
+    },
     render: function () {
+        var self = this;
         return {
             type: "bi.horizontal_adapt",
             items: [{
                 type: "bi.sign_initial_editor",
-                cls:"layout-bg5",
+                ref: function () {
-                value:"123",
+                    self.editor = this;
-                text:"456",
+                },
+                cls: "layout-bg5",
+                text: "原始值",
                 width: 300
             }],
-            vgap:20
+            vgap: 20
 
         }
     }

demo/js/case/editor/demo.state_editor.js

@@ -10,12 +10,11 @@ Demo.StateEditor = BI.inherit(BI.Widget, {
             type: "bi.horizontal_adapt",
             items: [{
                 type: "bi.state_editor",
-                cls:"bi-border",
+                value: "123",
-                value:"123",
+                text: "456",
-                text:"456",
                 width: 300
             }],
-            vgap:20
+            vgap: 20
 
         }
     }

demo/js/config/case.js

@@ -6,10 +6,6 @@ Demo.CASE_CONFIG = [{
     pId: 3,
     id: 301,
     text: "editors"
-}, {
-    pId: 301,
-    text: "bi.record_editor",
-    value: "demo.record_editor"
 }, {
     pId: 301,
     text: "bi.shelter_editor",
@@ -18,6 +14,10 @@ Demo.CASE_CONFIG = [{
     pId: 301,
     text: "bi.sign_editor",
     value: "demo.sign_editor"
+}, {
+    pId: 301,
+    text: "bi.sign_initial_editor",
+    value: "demo.sign_initial_editor"
 }, {
     pId: 301,
     text: "bi.state_editor",

demo/js/config/component.js

@@ -3,7 +3,7 @@
  */
 Demo.COMPONENT_CONFIG = [{
     id: 5,
-    text: "部件"
+    text: "部件+服务"
 }, {
     pId: 5,
     text: "bi.value_chooser_combo",

demo/js/config/widget.js

@@ -2,256 +2,255 @@ Demo.WIDGET_CONFIG = [{
     id: 4,
     text: "详细控件",
     open: true
-    }, {
+}, {
+    pId: 4,
+    id: 420,
+    text: '各种小控件',
+}, {
+    pId: 420,
+    text: "各种通用按钮",
+    value: "demo.buttons"
+}, {
+    pId: 420,
+    text: "各种提示性信息",
+    value: "demo.tips"
+}, {
+    pId: 420,
+    text: "各种items",
+    value: "demo.items"
+}, {
+    pId: 420,
+    text: "各种节点node",
+    value: "demo.nodes"
+}, {
+    pId: 420,
+    text: "各种segment",
+    value: "demo.segments"
+}, {
+    pId: 420,
+    text: "可以切换的树",
+    value: "demo.switch_tree"
+}, {
     id: 400,
     pId: 4,
     text: "tree"
-    }, {
+}, {
     pId: 400,
     text: "bi.multi_tree_combo",
     value: "demo.multi_tree_combo"
-    }, {
+}, {
+    pId: 400,
+    text: "bi.switch_tree",
+    value: "demo.switch_tree"
+}, {
     id: 401,
     pId: 4,
     text: "table"
-    }, {
+}, {
     pId: 401,
     text: "bi.preview_table",
     value: "demo.preview_table"
-    }, {
+}, {
     pId: 401,
     text: "bi.responsive_table",
     value: "demo.responsive_table"
-    }, {
+}, {
     pId: 401,
     text: "bi.excel_table",
     value: "demo.excel_table"
-    }, {
+}, {
     pId: 4,
     id: 402,
     text: "年份控件",
     open: false
-    }, {
+}, {
     pId: 402,
     text: "bi.year_combo",
     value: "demo.year"
-    }, {
+}, {
     pId: 4,
     id: 403,
     text: "月份控件",
     open: false
-    }, {
+}, {
     pId: 403,
     text: "bi.month_combo",
     value: "demo.month"
-    }, {
+}, {
     pId: 4,
     id: 404,
     text: "季度控件",
     open: false
-    }, {
+}, {
     pId: 404,
     text: "bi.quarter_combo",
     value: "demo.quarter"
-    }, {
+}, {
     pId: 4,
     id: 405,
     text: "下拉列表",
     open: false
-    }, {
+}, {
     pId: 405,
     text: "bi.down_list_combo",
     value: "demo.down_list"
-    }, {
+}, {
     pId: 4,
     id: 406,
     text: "文本框控件",
     open: false
-    }, {
+}, {
     pId: 406,
     text: "bi.text_editor",
     value: "demo.text_editor"
-    }, {
+}, {
     pId: 406,
     text: "bi.search_editor",
     value: "demo.search_editor"
-    }, {
+}, {
-        pId: 406,
-        text: "bi.sign_editor",
-        value: "demo.sign_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_initial_editor",
-        value: "demo.sign_initial_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_style_editor",
-        value: "demo.sign_style_editor"
-    }, {
-        pId: 406,
-        text: "bi.state_editor",
-        value: "demo.state_editor"
-    }, {
     pId: 406,
     text: "bi.clear_editor",
     value: "demo.clear_editor"
-    }, {
+}, {
-        pId: 406,
-        text: "bi.record_editor",
-        value: "demo.record_editor"
-    }, {
-        pId: 406,
-        text: "bi.shelter_editor",
-        value: "demo.shelter_editor"
-    },
-    {
     pId: 4,
     id: 407,
     text: "下拉框控件",
     open: false
-    }, {
+}, {
     pId: 407,
     text: "bi.text_value_combo",
     value: "demo.text_value_combo"
-    }, {
+}, {
     pId: 407,
     text: "bi.text_value_check_combo",
     value: "demo.text_value_check_combo"
-    }, {
+}, {
     pId: 407,
     text: "bi.text_value_down_list_combo",
     value: "demo.text_value_down_list_combo"
-    }, {
+}, {
     pId: 407,
     text: "bi.static_combo",
     value: "demo.static_combo"
-    }, {
+}, {
     pId: 407,
     text: "bi.icon_combo",
     value: "demo.icon_combo"
-    }, {
+}, {
     pId: 407,
     text: "bi.formula_combo",
     value: "demo.formula_combo"
-    }, {
+}, {
-        pId: 4,
-        id: 408,
-        text: "选择字段列表",
-        open: false
-    }, {
-        pId: 408,
-        text: "bi.placeholder"
-    }, {
-        pId: 4,
-        id: 409,
-        text: "公式编辑器",
-        open: false
-    }, {
-        pId: 409,
-        text: "bi.placeholder"
-    }, {
     pId: 4,
     id: 410,
     text: "数值区间控件"
-    }, {
+}, {
     pId: 410,
     text: "bi.numerical_interval",
     value: "demo.numberical_interval"
-    }, {
+}, {
     pId: 4,
     id: 411,
     text: "下拉复选框有确定按钮"
-    }, {
+}, {
     pId: 411,
     text: "bi.multi_select_combo",
     value: "demo.multi_select_combo"
-    }, {
+}, {
     pId: 4,
     id: 412,
     text: "简单日期控件"
-    }, {
+}, {
     pId: 412,
     text: "bi.date_combo",
     value: "demo.date"
-    }, {
+}, {
     pId: 412,
     text: "bi.date_pane_widget",
     value: "demo.date_pane_widget"
-    }, {
+}, {
     pId: 412,
     text: "bi.year_month_combo",
     value: "demo.year_month_combo"
-    },{
+}, {
     pId: 412,
     text: "bi.year_quarter_combo",
     value: "demo.year_quarter_combo"
-    },{
+}, {
     pId: 412,
     text: "bi.custom_date_time",
     value: "demo.custom_date_time"
-    },{
+}, {
     pId: 4,
     id: 413,
     text: "简单下拉树"
-    }, {
+}, {
     pId: 413,
     text: "bi.single_tree_combo",
     value: "demo.single_tree_combo"
-    }, {
+}, {
     pId: 413,
     text: "bi.multilayer_single_tree_combo",
     value: "demo.multilayer_single_tree_combo"
-    }, {
+}, {
     pId: 4,
     id: 414,
     text: "可选下拉树"
-    }, {
+}, {
     pId: 414,
     text: "bi.select_tree_combo",
     value: "demo.select_tree_combo"
-    }, {
+}, {
     pId: 414,
     text: "bi.multilayer_select_tree_combo",
     value: "demo.multilayer_select_tree_combo"
-    }, {
+}, {
     pId: 4,
     id: 415,
     text: "路径选择"
-    }, {
+}, {
     pId: 415,
     text: "bi.path_chooser",
     value: "demo.path_chooser"
-    }, {
+}, {
     pId: 415,
     text: "bi.direction_path_chooser",
     value: "demo.direction_path_chooser"
-    }, {
+}, {
     pId: 4,
     id: 416,
     text: "关联视图"
-    }, {
+}, {
     pId: 416,
     text: "bi.relation_view",
     value: "demo.relation_view"
-    }, {
+}, {
     pId: 4,
     id: 417,
     text: "布局"
-    }, {
+}, {
     pId: 417,
     text: "bi.adaptive_arrangement",
     value: "demo.adaptive_arrangement"
-    }, {
+}, {
     pId: 417,
     text: "bi.interactive_arrangement",
     value: "demo.interactive_arrangement"
-    }, {
+}, {
     pId: 4,
     id: 418,
     text: "提示对话框"
-    }, {
+}, {
     pId: 418,
     text: "bi.dialog",
     value: "demo.dialog"
-    }
+}, {
+    pId: 4,
+    id: 419,
+    text: "文件管理"
+}, {
+    pId: 419,
+    text: "bi.file_manager",
+    value: "demo.file_manager"
+}
 ];

demo/js/widget/basewidget/demo.buttons.js

@@ -0,0 +1,205 @@
+/**
+ * Created by Dailer on 2017/7/25.
+ */
+
+
+Demo.Buttons = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-button"
+    },
+    render: function () {
+        var items = [{
+                el: {
+                    type: 'bi.button',
+                    text: '一般按钮',
+                    level: 'common',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '表示成功状态按钮',
+                    level: 'success',
+                    height: 30
+                }
+            },
+            {
+                el: {
+                    type: 'bi.button',
+                    text: '表示警告状态的按钮',
+                    level: 'warning',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '表示忽略状态的按钮',
+                    level: 'ignore',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '普通灰化按钮',
+                    disabled: true,
+                    level: 'success',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '忽略状态灰化按钮',
+                    disabled: true,
+                    level: 'ignore',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '带图标的按钮',
+                    //level: 'ignore',
+                    iconClass: "close-font",
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '一般按钮',
+                    block: true,
+                    level: 'common',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '表示成功状态按钮',
+                    block: true,
+                    level: 'success',
+                    height: 30
+                }
+            },
+            {
+                el: {
+                    type: 'bi.button',
+                    text: '表示警告状态的按钮',
+                    block: true,
+                    level: 'warning',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '表示忽略状态的按钮',
+                    block: true,
+                    level: 'ignore',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '普通灰化按钮',
+                    block: true,
+                    disabled: true,
+                    level: 'success',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '忽略状态灰化按钮',
+                    block: true,
+                    disabled: true,
+                    level: 'ignore',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '带图标的按钮',
+                    block: true,
+                    //level: 'ignore',
+                    iconClass: "close-font",
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '一般按钮',
+                    clear: true,
+                    level: 'common',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '表示成功状态按钮',
+                    clear: true,
+                    level: 'success',
+                    height: 30
+                }
+            },
+            {
+                el: {
+                    type: 'bi.button',
+                    text: '表示警告状态的按钮',
+                    clear: true,
+                    level: 'warning',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '表示忽略状态的按钮',
+                    clear: true,
+                    level: 'ignore',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '普通灰化按钮',
+                    clear: true,
+                    disabled: true,
+                    level: 'success',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '忽略状态灰化按钮',
+                    clear: true,
+                    disabled: true,
+                    level: 'ignore',
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '带图标的按钮',
+                    clear: true,
+                    //level: 'ignore',
+                    iconClass: "close-font",
+                    height: 30
+                }
+            }, {
+                el: {
+                    type: 'bi.text_button',
+                    text: '文字按钮',
+                    height: 30
+                }
+            }
+        ];
+        BI.each(items, function (i, item) {
+            item.el.handler = function () {
+                BI.Msg.alert('按钮', this.options.text);
+            }
+        });
+        return {
+            type: "bi.left",
+            vgap: 100,
+            hgap: 20,
+            items: items
+        }
+    }
+});
+BI.shortcut("demo.buttons", Demo.Buttons);

demo/js/widget/basewidget/demo.items.js

@@ -0,0 +1,32 @@
+/**
+ * Created by Dailer on 2017/7/25.
+ */
+
+Demo.Items = BI.inherit(BI.Widget, {
+
+    render: function () {
+
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.label",
+                height: 30,
+                text: "单选item"
+            }, {
+                type: "bi.single_select_item",
+                text: "单选项"
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "复选item"
+            }, {
+                type: "bi.multi_select_item",
+                text: "复选项"
+            }],
+            hgap: 300
+        }
+    }
+});
+
+
+BI.shortcut("demo.items", Demo.Items);

demo/js/widget/basewidget/demo.mask.loading.js

@@ -0,0 +1,56 @@
+/**
+ * Created by Dailer on 2017/7/25.
+ */
+
+Demo.LoadingMask = BI.inherit(BI.Widget, {
+
+    render: function () {
+        var vessel = this;
+        var self = this;
+        var left = BI.createWidget({
+            type: "bi.center_adapt",
+            items: [{
+                type: "bi.button",
+                text: "LoadingMask",
+                height: 30,
+                handler: function () {
+                    var mask = BI.createWidget({
+                        type: "bi.loading_mask",
+                        masker: vessel,
+                        text: "加载中...3s后结束"
+                    });
+                    setTimeout(function () {
+                        mask.destroy();
+                    }, 3000);
+                }
+            }]
+        });
+        var right = BI.createWidget({
+            type: "bi.center_adapt",
+            items: [{
+                type: "bi.button",
+                text: "CancelLoadingMask",
+                height: 30,
+                handler: function () {
+                    var mask = BI.createWidget({
+                        type: "bi.loading_cancel_mask",
+                        masker: vessel,
+                        text: "正在加载数据"
+                    });
+                    mask.on(BI.LoadingCancelMask.EVENT_VALUE_CANCEL, function () {
+                        mask.destroy();
+                        BI.Msg.toast("取消加载了...");
+                    });
+                }
+            }]
+        });
+        BI.createWidget({
+            type: "bi.center_adapt",
+            element: vessel,
+            items: [left, right],
+            hgap: 20
+        })
+    }
+});
+
+BI.shortcut("demo.loading_mask", Demo.LoadingMask);

demo/js/widget/basewidget/demo.nodes.js

@@ -0,0 +1,36 @@
+/**
+ * Created by Dailer on 2017/7/25.
+ */
+
+Demo.Nodes = BI.inherit(BI.Widget, {
+
+    render: function (vessel) {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.label",
+                height: 30,
+                text: "十字形的节点"
+            }, {
+                type: "bi.plus_group_node",
+                text: "十字形的节点"
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "三角形的节点"
+            }, {
+                type: "bi.triangle_group_node",
+                text: "三角形的节点"
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "箭头节点"
+            }, {
+                type: "bi.arrow_group_node",
+                text: "箭头节点"
+            }]
+        }
+    }
+});
+
+BI.shortcut("demo.nodes", Demo.Nodes);

demo/js/widget/basewidget/demo.sagments.js

@@ -0,0 +1,35 @@
+/**
+ * Created by Dailer on 2017/7/25.
+ */
+
+Demo.Segments = BI.inherit(BI.Widget, {
+
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.label",
+                height: 30,
+                text: "默认风格"
+            }, {
+                type: "bi.segment",
+                items: [{
+                    text: "tab1",
+                    value: 1,
+                    selected: true
+                }, {
+                    text: "tab2",
+                    value: 2
+                }, {
+                    text: "tab3 disabled",
+                    disabled: true,
+                    value: 3
+                }]
+            }],
+            hgap: 50,
+            vgap: 20
+        }
+    }
+});
+
+BI.shortcut("demo.segments", Demo.Segments);

demo/js/widget/basewidget/demo.tips.js

@@ -0,0 +1,146 @@
+/**
+ * Created by Dailer on 2017/7/25.
+ */
+
+Demo.Tips = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-tips"
+    },
+    render: function () {
+        var btns = [];
+        var bubble = BI.createWidget({
+            type: "bi.left",
+            items: [{
+                el: {
+                    type: 'bi.button',
+                    text: 'bubble测试',
+                    height: 30,
+                    handler: function () {
+                        BI.Bubbles.show("singleBubble1", "bubble测试", this);
+                        btns.push("singleBubble1");
+                    }
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: 'bubble测试(居中显示)',
+                    height: 30,
+                    handler: function () {
+                        BI.Bubbles.show("singleBubble2", "bubble测试", this, {
+                            offsetStyle: "center"
+                        });
+                        btns.push("singleBubble2");
+                    }
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: 'bubble测试(右边显示)',
+                    height: 30,
+                    handler: function () {
+                        BI.Bubbles.show("singleBubble3", "bubble测试", this, {
+                            offsetStyle: "right"
+                        });
+                        btns.push("singleBubble3");
+                    }
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '隐藏所有 bubble',
+                    height: 30,
+                    cls: "layout-bg2",
+                    handler: function () {
+                        BI.each(btns, function (index, value) {
+                            BI.Bubbles.hide(value);
+                        })
+                    }
+                }
+            }],
+            hgap: 20
+        });
+
+        var title = BI.createWidget({
+            type: "bi.vertical",
+            items: [{
+                type: "bi.label",
+                cls: "layout-bg1",
+                height: 50,
+                title: "title提示",
+                text: "移上去有title提示",
+                textAlign: "center"
+            }, {
+                type: "bi.label",
+                cls: "layout-bg6",
+                height: 50,
+                disabled: true,
+                warningTitle: "title错误提示",
+                text: "移上去有title错误提示",
+                textAlign: "center"
+            }, {
+                type: "bi.label",
+                cls: "layout-bg2",
+                height: 50,
+                disabled: true,
+                tipType: "success",
+                title: "自定义title提示效果",
+                warningTitle: "自定义title提示效果",
+                text: "自定义title提示效果",
+                textAlign: "center"
+            }],
+            hgap: 20,
+            vgap: 20
+        });
+
+        var toast = BI.createWidget({
+            type: "bi.vertical",
+            items: [{
+                el: {
+                    type: 'bi.button',
+                    text: '简单Toast测试',
+                    height: 30,
+                    handler: function () {
+                        BI.Msg.toast("这是一条简单的数据");
+                    }
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '很长的Toast测试',
+                    height: 30,
+                    handler: function () {
+                        BI.Msg.toast("这是一条很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长的数据")
+                    }
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '非常长的Toast测试',
+                    height: 30,
+                    handler: function () {
+                        BI.Msg.toast("这是一条非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长非常长的数据")
+                    }
+                }
+            }, {
+                el: {
+                    type: 'bi.button',
+                    text: '错误提示Toast测试',
+                    level: "warning",
+                    height: 30,
+                    handler: function () {
+                        BI.Msg.toast("错误提示Toast测试", "warning");
+                    }
+                }
+            }],
+            vgap: 20
+        });
+
+        return {
+            type: "bi.horizontal_auto",
+            vgap: 20,
+            hgap: 20,
+            items: [bubble, title, toast]
+        }
+    }
+});
+BI.shortcut("demo.tips", Demo.Tips);

demo/js/widget/date/demo.date.js

@@ -11,18 +11,34 @@ Demo.Date = BI.inherit(BI.Widget, {
     },
 
     render: function () {
-
+        var self = this;
         return {
             type: "bi.horizontal_auto",
             vgap: 10,
             items: [{
                 type: "bi.date_combo",
+                ref: function () {
+                    self.datecombo = this;
+                },
                 width: 300
             }, {
                 type: "bi.button",
                 text: "getVlaue",
-                height: 50,
+                width: 300,
-                width: 300
+                handler: function () {
+                    BI.Msg.alert("date", JSON.stringify(self.datecombo.getValue()));
+                }
+            }, {
+                type: "bi.button",
+                text: "setVlaue '2017-12-31'",
+                width: 300,
+                handler: function () {
+                    self.datecombo.setValue({
+                        year: 2017,
+                        month: 11,
+                        day: 31
+                    })
+                }
             }]
         }
     }

demo/js/widget/date/demo.datepane.js

@@ -3,7 +3,7 @@ Demo.DatePane = BI.inherit(BI.Widget, {
         baseCls: "demo-datepane"
     },
     render: function () {
-
+        var self = this;
         return {
             type: "bi.horizontal_auto",
             items: [{
@@ -20,13 +20,26 @@ Demo.DatePane = BI.inherit(BI.Widget, {
                             month: 12,
                             day: 11
                         },
-                        height:300
+                        ref: function (_ref) {
+                            self.datepane = _ref;
+                        },
+                        height: 300
                     },
                     {
                         type: "bi.button",
                         text: "getValue",
                         handler: function () {
-                            BI.Msg.toast("date" + JSON.stringify(datepane.getValue()));
+                            BI.Msg.toast("date" + JSON.stringify(self.datepane.getValue()));
+                        }
+                    }, {
+                        type: "bi.button",
+                        text: "setVlaue '2017-12-31'",
+                        handler: function () {
+                            self.datepane.setValue({
+                                year: 2017,
+                                month: 11,
+                                day: 31
+                            })
                         }
                     }
                 ],

demo/js/widget/editor/demo.record_editor.js

@@ -1,22 +0,0 @@
-/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.RecordEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.record_editor",
-                cls: "bi-border",
-                width: 300,
-                watermark: "这个是可以记录输入的"
-            }],
-            vgap: 20
-        }
-    }
-})
-
-BI.shortcut("demo.record_editor", Demo.RecordEditor);

demo/js/widget/editor/demo.sign_style_editor.js

@@ -1,22 +0,0 @@
-/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.SignStyleEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-exceltable"
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_adapt",
-            items: [{
-                type: "bi.sign_style_editor",
-                cls:"layout-bg5",
-                value:"12313",
-                width: 300
-            }],
-            vgap:20
-        }
-    }
-})
-
-BI.shortcut("demo.sign_style_editor", Demo.SignStyleEditor);

demo/js/widget/filemanager/demo.file.manager.js

@@ -0,0 +1,68 @@
+/* 文件管理导航
+    Created by dailer on 2017 / 7 / 21. 
+   */
+Demo.FileManager = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: ""
+    },
+
+    render: function () {
+        var items = [{
+            id: "1",
+            value: "1",
+            text: "根目录",
+            lastModify: 1454316355142
+        }, {
+            id: "11",
+            pId: "1",
+            value: "11",
+            text: "第一级子目录1",
+            lastModify: 1454316355142
+        }, {
+            id: "12",
+            pId: "1",
+            value: "12",
+            text: "第一级子目录2",
+            lastModify: 1454316355142
+        }, {
+            id: "111",
+            pId: "11",
+            value: "111",
+            text: "第二级子目录",
+            lastModify: 1454316355142
+        }, {
+            id: "121",
+            pId: "111",
+            buildUrl: "www.baidu.com",
+            value: "121",
+            text: "文件1",
+            lastModify: 1454316355142
+        }, {
+            id: "122",
+            pId: "111",
+            buildUrl: "www.baidu.com",
+            value: "122",
+            text: "文件2",
+            lastModify: 1454316355142
+        }];
+        var filemanager = BI.createWidget({
+            type: "bi.file_manager",
+            items: items
+        });
+        return {
+            type: "bi.vtape",
+            items: [{
+                el: filemanager,
+                height: "fill"
+            }, {
+                type: "bi.button",
+                text: "getValue",
+                handler: function () {
+                    BI.Msg.alert("", JSON.stringify(filemanager.getValue()));
+                },
+                height: 25
+            }]
+        }
+    }
+});
+BI.shortcut("demo.file_manager", Demo.FileManager);

demo/js/widget/month/demo.month.js

@@ -6,13 +6,35 @@ Demo.Month = BI.inherit(BI.Widget, {
         baseCls: "demo-exceltable"
     },
     render: function () {
+        var self = this;
         return {
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal_auto",
             items: [{
                 type: "bi.month_combo",
+                width: 300,
+                ref: function () {
+                    self.monthcombo = this;
+                }
+            }, {
+                type: "bi.button",
+                text: "getValue",
+                handler: function () {
+                    BI.Msg.toast(JSON.stringify(self.monthcombo.getValue()));
+                },
                 width: 300
-            }]
+            }, {
-
+                type: "bi.button",
+                text: "setValue : 11",
+                handler: function () {
+                    self.monthcombo.setValue(11);
+                },
+                width: 300
+            }, {
+                type: "bi.label",
+                text: "月份value 范围为0-11,显示范围为1-12",
+                width: 300
+            }],
+            vgap: 10
         }
     }
 })

demo/js/widget/quarter/demo.quarter.js

@@ -6,13 +6,31 @@ Demo.Quarter = BI.inherit(BI.Widget, {
         baseCls: "demo-exceltable"
     },
     render: function () {
+        var self = this;
         return {
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal_auto",
             items: [{
                 type: "bi.quarter_combo",
+                width: 300,
+                ref: function () {
+                    self.quartercombo = this;
+                }
+            }, {
+                type: "bi.button",
+                text: "getValue",
+                handler: function () {
+                    BI.Msg.toast(JSON.stringify(self.quartercombo.getValue()));
+                },
                 width: 300
-            }]
+            }, {
-
+                type: "bi.button",
+                text: "setValue : 3",
+                handler: function () {
+                    self.quartercombo.setValue(3);
+                },
+                width: 300
+            }],
+            vgap: 10
         }
     }
 })

demo/js/widget/selecttree/demo.multilayer_select_tree_combo.js

@@ -26,6 +26,13 @@ Demo.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                     BI.Msg.toast(self.tree.getValue()[0]);
                 },
                 width: 300
+            }, {
+                type: "bi.button",
+                text: "setVlaue (第二级文件1)",
+                handler: function () {
+                    self.tree.setValue(["第二级文件1"]);
+                },
+                width: 300
             }],
             vgap: 20
         }

demo/js/widget/selecttree/demo.select_tree_combo.js

@@ -8,154 +8,7 @@ Demo.SelectTreeCombo = BI.inherit(BI.Widget, {
 
     render: function () {
         var self = this;
-        var items = [{
+        var items = BI.deepClone(Demo.CONSTANTS.TREE);
-            id: 1,
-            text: "第一项",
-            value: 1,
-            isParent: true,
-            title: "第一项"
-        }, {
-            id: 2,
-            text: "第二项",
-            value: 2,
-            isParent: true,
-            title: "第二项"
-        }, {
-            id: 3,
-            text: "第三项",
-            value: 3,
-            isParent: true,
-            open: true,
-            title: "第三项"
-        }, {
-            id: 4,
-            text: "第四项",
-            value: 4,
-            isParent: true,
-            title: "第四项"
-        }, {
-            id: 5,
-            text: "第五项",
-            value: 5,
-            isParent: true,
-            title: "第五项"
-        }, {
-            id: 6,
-            text: "第六项",
-            value: 6,
-            isParent: true,
-            open: true,
-            title: "第六项"
-        }, {
-            id: 7,
-            text: "第七项",
-            value: 7,
-            isParent: true,
-            open: true,
-            title: "第七项"
-        }, {
-            id: 11,
-            pId: 1,
-            text: "子项1",
-            value: 11,
-            title: "子项1"
-        }, {
-            id: 12,
-            pId: 1,
-            text: "子项2",
-            value: 12,
-            title: "子项2"
-        }, {
-            id: 13,
-            pId: 1,
-            text: "子项3",
-            value: 13,
-            title: "子项3"
-        }, {
-            id: 21,
-            pId: 2,
-            text: "子项1",
-            value: 21,
-            title: "子项1"
-        }, {
-            id: 22,
-            pId: 2,
-            text: "子项2",
-            value: 22,
-            title: "子项2"
-        }, {
-            id: 31,
-            pId: 3,
-            text: "子项1",
-            value: 31,
-            title: "子项1"
-        }, {
-            id: 32,
-            pId: 3,
-            text: "子项2",
-            value: 32,
-            title: "子项2"
-        }, {
-            id: 33,
-            pId: 3,
-            text: "子项3",
-            value: 33,
-            title: "子项3"
-        }, {
-            id: 41,
-            pId: 4,
-            text: "子项1",
-            value: 41,
-            title: "子项1"
-        }, {
-            id: 42,
-            pId: 4,
-            text: "子项2",
-            value: 42,
-            title: "子项2"
-        }, {
-            id: 43,
-            pId: 4,
-            text: "子项3",
-            value: 43,
-            title: "子项3"
-        }, {
-            id: 51,
-            pId: 5,
-            text: "子项1",
-            value: 51,
-            title: "子项1"
-        }, {
-            id: 52,
-            pId: 5,
-            text: "子项2",
-            value: 52,
-            title: "子项2"
-        }, {
-            id: 61,
-            pId: 6,
-            text: "子项1",
-            value: 61,
-            title: "子项1"
-        }, {
-            id: 62,
-            pId: 6,
-            text: "子项2",
-            value: 62,
-            title: "子项2"
-        }, {
-            id: 71,
-            pId: 7,
-            text: "子项1",
-            value: 71,
-            title: "子项1"
-        }, {
-            id: 72,
-            pId: 7,
-            text: "子项2",
-            value: 72,
-            title: "子项2"
-        }];
         return {
             type: "bi.horizontal_auto",
             items: [{
@@ -173,6 +26,13 @@ Demo.SelectTreeCombo = BI.inherit(BI.Widget, {
                     BI.Msg.toast(self.tree.getValue()[0]);
                 },
                 width: 300
+            }, {
+                type: "bi.button",
+                text: "setVlaue (第二级文件1)",
+                handler: function () {
+                    self.tree.setValue(["第二级文件1"]);
+                },
+                width: 300
             }],
             vgap: 20
         }

demo/js/widget/singletree/demo.multilayer_single_tree_combo.js

@@ -26,6 +26,13 @@ Demo.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                     BI.Msg.toast(self.tree.getValue()[0]);
                 },
                 width: 300
+            }, {
+                type: "bi.button",
+                text: "setVlaue (第二级文件1)",
+                handler: function () {
+                    self.tree.setValue(["第二级文件1"]);
+                },
+                width: 300
             }],
             vgap: 20
         }

demo/js/widget/singletree/demo.single_tree_combo.js

@@ -8,6 +8,7 @@ Demo.SingleTreeCombo = BI.inherit(BI.Widget, {
 
     render: function () {
         var self = this;
+        var items = BI.deepClone(Demo.CONSTANTS.TREE);
         return {
             type: "bi.horizontal_auto",
             items: [{
@@ -16,154 +17,7 @@ Demo.SingleTreeCombo = BI.inherit(BI.Widget, {
                     self.tree = _ref;
                 },
                 text: "默认值",
-                items: [{
+                items: items,
-                    id: 1,
-                    text: "第一项",
-                    value: 1,
-                    isParent: true,
-                    title: "第一项"
-                }, {
-                    id: 2,
-                    text: "第二项",
-                    value: 1,
-                    isParent: true,
-                    title: "第二项"
-                }, {
-                    id: 3,
-                    text: "第三项",
-                    value: 1,
-                    isParent: true,
-                    open: true,
-                    title: "第三项"
-                }, {
-                    id: 4,
-                    text: "第四项",
-                    value: 1,
-                    isParent: true,
-                    title: "第四项"
-                }, {
-                    id: 5,
-                    text: "第五项",
-                    value: 1,
-                    isParent: true,
-                    title: "第五项"
-                }, {
-                    id: 6,
-                    text: "第六项",
-                    value: 1,
-                    isParent: true,
-                    open: true,
-                    title: "第六项"
-                }, {
-                    id: 7,
-                    text: "第七项",
-                    value: 1,
-                    isParent: true,
-                    open: true,
-                    title: "第七项"
-                }, {
-                    id: 11,
-                    pId: 1,
-                    text: "子项1",
-                    value: 11,
-                    title: "子项1"
-                }, {
-                    id: 12,
-                    pId: 1,
-                    text: "子项2",
-                    value: 12,
-                    title: "子项2"
-                }, {
-                    id: 13,
-                    pId: 1,
-                    text: "子项3",
-                    value: 13,
-                    title: "子项3"
-                }, {
-                    id: 21,
-                    pId: 2,
-                    text: "子项1",
-                    value: 21,
-                    title: "子项1"
-                }, {
-                    id: 22,
-                    pId: 2,
-                    text: "子项2",
-                    value: 22,
-                    title: "子项2"
-                }, {
-                    id: 31,
-                    pId: 3,
-                    text: "子项1",
-                    value: 31,
-                    title: "子项1"
-                }, {
-                    id: 32,
-                    pId: 3,
-                    text: "子项2",
-                    value: 32,
-                    title: "子项2"
-                }, {
-                    id: 33,
-                    pId: 3,
-                    text: "子项3",
-                    value: 33,
-                    title: "子项3"
-                }, {
-                    id: 41,
-                    pId: 4,
-                    text: "子项1",
-                    value: 41,
-                    title: "子项1"
-                }, {
-                    id: 42,
-                    pId: 4,
-                    text: "子项2",
-                    value: 42,
-                    title: "子项2"
-                }, {
-                    id: 43,
-                    pId: 4,
-                    text: "子项3",
-                    value: 43,
-                    title: "子项3"
-                }, {
-                    id: 51,
-                    pId: 5,
-                    text: "子项1",
-                    value: 51,
-                    title: "子项1"
-                }, {
-                    id: 52,
-                    pId: 5,
-                    text: "子项2",
-                    value: 52,
-                    title: "子项2"
-                }, {
-                    id: 61,
-                    pId: 6,
-                    text: "子项1",
-                    value: 61,
-                    title: "子项1"
-                }, {
-                    id: 62,
-                    pId: 6,
-                    text: "子项2",
-                    value: 62,
-                    title: "子项2"
-                }, {
-                    id: 71,
-                    pId: 7,
-                    text: "子项1",
-                    value: 71,
-                    title: "子项1"
-                }, {
-                    id: 72,
-                    pId: 7,
-                    text: "子项2",
-                    value: 72,
-                    title: "子项2"
-                }],
                 width: 300
             }, {
                 type: "bi.button",
@@ -172,6 +26,13 @@ Demo.SingleTreeCombo = BI.inherit(BI.Widget, {
                     BI.Msg.toast(self.tree.getValue()[0]);
                 },
                 width: 300
+            }, {
+                type: "bi.button",
+                text: "setVlaue (第二级文件1)",
+                handler: function () {
+                    self.tree.setValue(["第二级文件1"]);
+                },
+                width: 300
             }],
             vgap: 20
         }

demo/js/widget/tree/demo.switch_tree.js

@@ -1,24 +0,0 @@
-/**
- * Created by Dailer on 2017/7/13.
- */
-Demo.SwitchTree = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-
-        var items = BI.deepClone(Demo.CONSTANTS.TREE);
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.switch_tree",
-                items: items
-            },{
-                type:"bi.button",
-                text:"getValue"
-            }]
-        }
-    }
-})
-
-BI.shortcut("demo.switch_tree", Demo.SwitchTree);

demo/js/widget/tree/demo.switchtree.js

@@ -0,0 +1,56 @@
+/**
+ * Created by Dailer on 2017/7/26.
+ */
+
+
+Demo.SwitchTree = BI.inherit(BI.Widget, {
+
+    render: function () {
+        var self = this;
+        var tree = BI.createWidget({
+            type: "bi.switch_tree",
+            items: BI.deepClone(Demo.CONSTANTS.TREE)
+        });
+
+        return {
+            type: "bi.vtape",
+            items: [{
+                el: tree
+            }, {
+                el: {
+                    type: "bi.button",
+                    height: 25,
+                    text: "点击切换",
+                    handler: function () {
+                        tree.switchSelect();
+                    }
+                },
+                height: 25
+            }, {
+                el: {
+                    type: "bi.button",
+                    height: 25,
+                    text: "getValue",
+                    handler: function () {
+                        BI.Msg.alert("", JSON.stringify(tree.getValue()));
+                    }
+                },
+                height: 25
+            }, {
+                el: {
+                    type: "bi.button",
+                    height: 25,
+                    text: "setValue (第二级文件1)",
+                    handler: function () {
+                        tree.setValue(["第二级文件1"]);
+                    }
+                },
+                height: 25
+            }],
+            width: 500,
+            hgap: 300
+        }
+    }
+});
+
+BI.shortcut("demo.switch_tree", Demo.SwitchTree);

demo/js/widget/year/demo.year.js

@@ -6,12 +6,31 @@ Demo.Year = BI.inherit(BI.Widget, {
         baseCls: "demo-exceltable"
     },
     render: function () {
+        var self = this;
         return {
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal_auto",
             items: [{
                 type: "bi.year_combo",
+                width: 300,
+                ref: function () {
+                    self.yearcombo = this;
+                }
+            }, {
+                type: "bi.button",
+                text: "getValue",
+                handler: function () {
+                    BI.Msg.toast(JSON.stringify(self.yearcombo.getValue()));
+                },
+                width: 300
+            }, {
+                type: "bi.button",
+                text: "setValue : 2018",
+                handler: function () {
+                    self.yearcombo.setValue(2018);
+                },
                 width: 300
-            }]
+            }],
+            vgap: 10
         }
     }
 })

demo/js/widget/yearmonth/demo.year_month_combo.js

@@ -23,6 +23,16 @@ Demo.YearMonthCombo = BI.inherit(BI.Widget, {
                     BI.Msg.toast(JSON.stringify(self.widget.getValue()))
                 },
                 width: 300
+            }, {
+                type: "bi.button",
+                text: "setVlaue '2017-12'",
+                width: 300,
+                handler: function () {
+                    self.widget.setValue({
+                        year: 2017,
+                        month: 11
+                    })
+                }
             }],
             vgap: 20
         }

demo/js/widget/yearquarter/demo.year_quarter_combo.js

@@ -6,24 +6,34 @@ Demo.YearQuarterCombo = BI.inherit(BI.Widget, {
         baseCls: ""
     },
     render: function () {
-        var self=this;
+        var self = this;
         return {
             type: "bi.horizontal_auto",
             items: [{
                 type: "bi.year_quarter_combo",
                 width: 300,
-                ref:function(_ref){
+                ref: function (_ref) {
-                    self.widget=_ref;
+                    self.widget = _ref;
                 },
                 yearBehaviors: {},
                 quarterBehaviors: {},
             }, {
                 type: "bi.button",
                 text: "getValue",
-                handler:function(){
+                handler: function () {
                     BI.Msg.toast(JSON.stringify(self.widget.getValue()))
                 },
                 width: 300
+            }, {
+                type: "bi.button",
+                text: "setVlaue '2017 季度3'",
+                width: 300,
+                handler: function () {
+                    self.widget.setValue({
+                        year: 2017,
+                        quarter: 3
+                    })
+                }
             }],
             vgap: 20
         }

demo/less/main.less

@@ -64,3 +64,34 @@ body {
 .demo-editor {
   border: 1px solid rgb(204, 204, 204);
 }
+
+.demo-clolor {
+  color: #1a1a1a;
+}
+
+.bi-progress-bar-processor {
+  transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+  background: #3f8ce8;
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
+}
+
+.bi-progress-text-bar-processor {
+  transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+}
+
+.bi-progress-bar-bar {
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+}

docs/base.js

@@ -14351,15 +14351,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
 
     _checkWaterMark: function () {
         var o = this.options;
-        if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
+        if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
             this.watermark && this.watermark.visible();
         } else {
             this.watermark && this.watermark.invisible();
         }
     },
 
-    disableWarterMark: function () {
+    disableWaterMark: function () {
-        this.disabledWarterMark = true;
+        this.disabledWaterMark = true;
         this._checkWaterMark();
     },
 
@@ -18111,7 +18111,7 @@ BI.Editor = BI.inherit(BI.Single, {
 
     _checkWaterMark: function () {
         var o = this.options;
-        if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
+        if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
             this.watermark && this.watermark.visible();
         } else {
             this.watermark && this.watermark.invisible();
@@ -18149,13 +18149,13 @@ BI.Editor = BI.inherit(BI.Single, {
         this._checkError();
     },
 
-    disableWarterMark: function () {
+    disableWaterMark: function () {
-        this.disabledWarterMark = true;
+        this.disabledWaterMark = true;
         this._checkWaterMark();
     },
 
-    enableWarterMark: function () {
+    enableWaterMark: function () {
-        this.disabledWarterMark = false;
+        this.disabledWaterMark = false;
         this._checkWaterMark();
     },
 
@@ -18489,6 +18489,9 @@ BI.Icon = BI.inherit(BI.Single, {
     },
     _init: function () {
         BI.Icon.superclass._init.apply(this, arguments);
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     }
 });
 BI.shortcut("bi.icon", BI.Icon);/**
@@ -30100,6 +30103,41 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
+        this.topLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.topRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+
+        function overscan(grid, w, h, rSize, cSize) {
+            var rCount = h / rSize;
+            var cCount = w / cSize;
+            if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
+                grid.attr("overscanRowCount", 100);
+                grid.attr("overscanColumnCount", 100);
+            }
+        }
+
+        if (freezeColLength > 0) {
+            overscan(this.topLeftGrid, tlw, tlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
+            overscan(this.bottomLeftGrid, blw, blh, o.rowSize, totalLeftColumnSize / freezeColLength);
+        }
+        if (o.columnSize.length - freezeColLength > 0) {
+            overscan(this.topRight, trw, trh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+            overscan(this.bottomRightGrid, brw, brh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+        }
+
         this.topLeftGrid._populate(this.header[0]);
         this.topRightGrid._populate(this.header[1]);
         this.bottomLeftGrid._populate(this.items[0]);
@@ -30326,7 +30364,8 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
     _populateTable: function () {
         var self = this, o = this.options;
-        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [];
+        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
+            summaryColumnSizeArray = [];
         var freezeColLength = this._getFreezeColLength();
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@@ -30417,6 +30456,42 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
                 }
             });
         });
+
+        this.topLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.topRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+
+        function overscan(grid, w, h, rSize, cSize) {
+            var rCount = h / rSize;
+            var cCount = w / cSize;
+            if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
+                grid.attr("overscanRowCount", 100);
+                grid.attr("overscanColumnCount", 100);
+            }
+        }
+
+        if (freezeColLength > 0) {
+            overscan(this.topLeftGrid, otlw, otlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
+            overscan(this.bottomLeftGrid, oblw, oblh, o.rowSize, totalLeftColumnSize / freezeColLength);
+        }
+        if (o.columnSize.length - freezeColLength > 0) {
+            overscan(this.topRight, otrw, otrh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+            overscan(this.bottomRightGrid, obrw, obrh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+        }
+
         this.topLeftGrid.populate(leftHeader);
         this.topRightGrid.populate(rightHeader);
         this.bottomLeftGrid.populate(leftItems);
@@ -31291,8 +31366,8 @@ BI.Table = BI.inherit(BI.Widget, {
                         var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
                         if (isNeedMergeCol === true) {
                             mergeCol(i, j);
-                            preCol[j] = preRow[j - 1];
+                            preCol[j] = preRow[i];
-                            preCW[j] = preRW[j - 1];
+                            preCW[j] = preRW[i];
                         } else {
                             createOneEl(i, j);
                         }

docs/case.js

@@ -6903,9 +6903,7 @@ BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
 BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
 
 BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
- * sign是新值（初始value值）形式的自适应宽度的输入框
+ * Created by User on 2017/7/28.
- * @class BI.SignInitialEditor
- * @extends BI.Single
  */
 BI.SignInitialEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
@@ -6934,8 +6932,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         BI.SignInitialEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget({
-            type: "bi.sign_editor",
+            type: "bi.editor",
-            element: this,
             height: o.height,
             hgap: o.hgap,
             vgap: o.vgap,
@@ -6943,7 +6940,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
-            value: o.value || o.text,
+            value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
             mouseOut: o.mouseOut,
@@ -6951,67 +6948,163 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             errorText: o.errorText
         });
-        if(BI.isNotNull(o.value)){
+        this.text = BI.createWidget({
-            this.setState(o.value);
+            type: "bi.text_button",
+            cls: "sign-editor-text",
+            title: o.title,
+            warningTitle: o.warningTitle,
+            tipType: o.tipType,
+            textAlign: "left",
+            height: o.height,
+            hgap: 4,
+            handler: function () {
+                self._showInput();
+                self.editor.focus();
+                self.editor.selectAll();
             }
+        });
+        this.text.on(BI.TextButton.EVENT_CHANGE, function () {
+            BI.nextTick(function () {
+                self.fireEvent(BI.SignInitialEditor.EVENT_CLICK_LABEL)
+            });
+        });
+        BI.createWidget({
+            type: "bi.absolute",
+            element: this,
+            items: [{
+                el: this.text,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            }]
+        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+        this.editor.on(BI.Editor.EVENT_FOCUS, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS);
+            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_BLUR, function () {
+        this.editor.on(BI.Editor.EVENT_BLUR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR);
+            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CLICK, function () {
+        this.editor.on(BI.Editor.EVENT_CLICK, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CHANGE, function () {
+        this.editor.on(BI.Editor.EVENT_CHANGE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function (v) {
+        this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) {
-            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN);
+            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN, arguments);
         });
 
-        this.editor.on(BI.SignEditor.EVENT_VALID, function () {
+        this.editor.on(BI.Editor.EVENT_VALID, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_VALID);
+            self.fireEvent(BI.SignInitialEditor.EVENT_VALID, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CONFIRM, function () {
+        this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
-            self.setState(self.editor.getValue());
+            self._showHint();
-            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_START, function () {
+        this.editor.on(BI.Editor.EVENT_START, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_START);
+            self.fireEvent(BI.SignInitialEditor.EVENT_START, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_PAUSE, function () {
+        this.editor.on(BI.Editor.EVENT_PAUSE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_STOP, function () {
+        this.editor.on(BI.Editor.EVENT_STOP, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_STOP);
+            self.fireEvent(BI.SignInitialEditor.EVENT_STOP, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_SPACE, function () {
+        this.editor.on(BI.Editor.EVENT_SPACE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ERROR, function () {
+        this.editor.on(BI.Editor.EVENT_ERROR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ENTER, function () {
+        this.editor.on(BI.Editor.EVENT_ENTER, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER);
+            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_RESTRICT, function () {
+        this.editor.on(BI.Editor.EVENT_RESTRICT, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT);
+            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT, arguments);
+        });
+        this.editor.on(BI.Editor.EVENT_EMPTY, function () {
+            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_EMPTY, function () {
+        BI.createWidget({
-            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY);
+            type: "bi.vertical",
+            scrolly: false,
+            element: this,
+            items: [this.editor]
         });
+        this._showHint();
+        self._checkText();
+    },
+
+    _checkText: function () {
+        var o = this.options;
+        BI.nextTick(BI.bind(function () {
+            if (this.editor.getValue() === "") {
+                this.text.setValue(o.watermark || "");
+                this.text.element.addClass("bi-water-mark");
+            } else {
+                var v = this.editor.getValue();
+                v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
+                this.text.setValue(v);
+                this.text.element.removeClass("bi-water-mark");
+            }
+        }, this));
+    },
+
+    _showInput: function () {
+        this.editor.visible();
+        this.text.invisible();
+    },
+
+    _showHint: function () {
+        this.editor.invisible();
+        this.text.visible();
+    },
+
+    setTitle: function (title) {
+        this.text.setTitle(title);
+    },
+
+    setWarningTitle: function (title) {
+        this.text.setWarningTitle(title);
     },
 
     focus: function () {
+        this._showInput();
         this.editor.focus();
     },
 
     blur: function () {
         this.editor.blur();
+        this._showHint();
+        this._checkText();
+    },
+
+    doRedMark: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
     },
 
     isValid: function () {
@@ -7026,9 +7119,19 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         return this.editor.getErrorText();
     },
 
+    isEditing: function () {
+        return this.editor.isEditing();
+    },
+
+    getLastValidValue: function () {
+        return this.editor.getLastValidValue();
+    },
+
     setValue: function (v) {
+        var o = this.options;
         this.editor.setValue(v.value);
-        this.setState(v.value);
+        o.text = v.text || o.text;
+        this._checkText();
     },
 
     getValue: function () {
@@ -7039,13 +7142,14 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
     },
 
     getState: function () {
-        return this.editor.getState();
+        return this.text.getValue();
     },
 
     setState: function (v) {
         var o = this.options;
+        this._showHint();
         v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
-        this.editor.setState(v);
+        this.text.setValue(v);
     }
 });
 BI.SignInitialEditor.EVENT_CHANGE = "EVENT_CHANGE";
@@ -8687,6 +8791,11 @@ BI.SelectList = BI.inherit(BI.Widget, {
         this._checkAllSelected();
     },
 
+    _setEnable: function (enable) {
+        BI.SelectList.superclass._setEnable.apply(this, arguments);
+        this.toolbar.setEnable(enable);
+    },
+
     resetHeight: function (h) {
         var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
         this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :

docs/core.js

@@ -14082,10 +14082,7 @@ if (!window.BI) {
             return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
         },
 
-        isIE9Below: function () {
+        getIEVersion: function () {
-            if (!BI.isIE()) {
-                return false;
-            }
             var version = 0;
             var agent = navigator.userAgent.toLowerCase();
             var v1 = agent.match(/(?:msie\s([\w.]+))/);
@@ -14099,7 +14096,18 @@ if (!window.BI) {
             } else {
                 version = 0;
             }
-            return version < 9;
+            return version;
+        },
+
+        isIE9Below: function () {
+            if (!BI.isIE()) {
+                return false;
+            }
+            return this.getIEVersion() < 9;
+        },
+
+        isIE9: function () {
+            return this.getIEVersion() === 9;
         },
 
         isEdge: function () {
@@ -14668,6 +14676,13 @@ BI.Widget = BI.inherit(BI.OB, {
     },
 
     attr: function (key, value) {
+        var self = this;
+        if (BI.isPlainObject(key)) {
+            BI.each(key, function (k, v) {
+                self.attr(k, v);
+            })
+            return;
+        }
         if (BI.isNotNull(value)) {
             return this.options[key] = value;
         }

docs/demo.css

@@ -51,6 +51,33 @@ body {
 .demo-editor {
   border: 1px solid #cccccc;
 }
+.demo-clolor {
+  color: #1a1a1a;
+}
+.bi-progress-bar-processor {
+  transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+  background: #3f8ce8;
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
+}
+.bi-progress-text-bar-processor {
+  transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+}
+.bi-progress-bar-bar {
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+}
 .demo-north {
   background-color: #3c8dbc;
 }

docs/widget.js

@@ -629,7 +629,12 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
                     clearInterval(self._scrollInterval);
                     self._scrollInterval = null;
                 }
+                var count = 0;
                 self._scrollInterval = setInterval(function () {
+                    count++;
+                    if (count <= 3) {
+                        return;
+                    }
                     var offset = self._getScrollOffset();
                     var t = offset.top + map[direction][0] * 40;
                     var l = offset.left + map[direction][1] * 40;
@@ -2613,12 +2618,13 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
             month: date.month,
             day: this.selectedTime.day
         });
-        return calendar;
+        return calendar
     },
 
     _init: function () {
         BI.DateCalendarPopup.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
+        var self = this,
+            o = this.options;
         this.today = new Date();
         this._year = this.today.getFullYear();
         this._month = this.today.getMonth();
@@ -2764,7 +2770,8 @@ BI.DateCombo = BI.inherit(BI.Widget, {
     },
     _init: function () {
         BI.DateCombo.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
+        var self = this,
+            o = this.options;
 
         this.trigger = BI.createWidget({
             type: "bi.date_trigger"
@@ -5292,7 +5299,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, {
 
     _const: {
         normal_color: "#ffffff",
-        select_color: "#f4f4f4"
+        select_color: "#eff1f4"
     },
     _defaultConfig: function () {
         return BI.extend(BI.FileManagerNavButton.superclass._defaultConfig.apply(this, arguments), {

src/base/formula/formulaeditor.js

@@ -90,15 +90,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
 
     _checkWaterMark: function () {
         var o = this.options;
-        if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
+        if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
             this.watermark && this.watermark.visible();
         } else {
             this.watermark && this.watermark.invisible();
         }
     },
 
-    disableWarterMark: function () {
+    disableWaterMark: function () {
-        this.disabledWarterMark = true;
+        this.disabledWaterMark = true;
         this._checkWaterMark();
     },
 

src/base/single/editor/editor.js

@@ -204,7 +204,7 @@ BI.Editor = BI.inherit(BI.Single, {
 
     _checkWaterMark: function () {
         var o = this.options;
-        if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
+        if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
             this.watermark && this.watermark.visible();
         } else {
             this.watermark && this.watermark.invisible();
@@ -242,13 +242,13 @@ BI.Editor = BI.inherit(BI.Single, {
         this._checkError();
     },
 
-    disableWarterMark: function () {
+    disableWaterMark: function () {
-        this.disabledWarterMark = true;
+        this.disabledWaterMark = true;
         this._checkWaterMark();
     },
 
-    enableWarterMark: function () {
+    enableWaterMark: function () {
-        this.disabledWarterMark = false;
+        this.disabledWaterMark = false;
         this._checkWaterMark();
     },
 

src/base/single/icon/icon.js

@@ -13,6 +13,9 @@ BI.Icon = BI.inherit(BI.Single, {
     },
     _init: function () {
         BI.Icon.superclass._init.apply(this, arguments);
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     }
 });
 BI.shortcut("bi.icon", BI.Icon);

src/base/table/table.grid.js

@@ -362,6 +362,41 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
+        this.topLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.topRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+
+        function overscan(grid, w, h, rSize, cSize) {
+            var rCount = h / rSize;
+            var cCount = w / cSize;
+            if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
+                grid.attr("overscanRowCount", 100);
+                grid.attr("overscanColumnCount", 100);
+            }
+        }
+
+        if (freezeColLength > 0) {
+            overscan(this.topLeftGrid, tlw, tlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
+            overscan(this.bottomLeftGrid, blw, blh, o.rowSize, totalLeftColumnSize / freezeColLength);
+        }
+        if (o.columnSize.length - freezeColLength > 0) {
+            overscan(this.topRight, trw, trh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+            overscan(this.bottomRightGrid, brw, brh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+        }
+
         this.topLeftGrid._populate(this.header[0]);
         this.topRightGrid._populate(this.header[1]);
         this.bottomLeftGrid._populate(this.items[0]);

src/base/table/table.grid.quick.js

@@ -116,7 +116,8 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
     _populateTable: function () {
         var self = this, o = this.options;
-        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [];
+        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
+            summaryColumnSizeArray = [];
         var freezeColLength = this._getFreezeColLength();
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@@ -207,6 +208,42 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
                 }
             });
         });
+
+        this.topLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.topRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomLeftGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+        this.bottomRightGrid.attr({
+            overscanColumnCount: 0,
+            overscanRowCount: 0
+        });
+
+        function overscan(grid, w, h, rSize, cSize) {
+            var rCount = h / rSize;
+            var cCount = w / cSize;
+            if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
+                grid.attr("overscanRowCount", 100);
+                grid.attr("overscanColumnCount", 100);
+            }
+        }
+
+        if (freezeColLength > 0) {
+            overscan(this.topLeftGrid, otlw, otlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
+            overscan(this.bottomLeftGrid, oblw, oblh, o.rowSize, totalLeftColumnSize / freezeColLength);
+        }
+        if (o.columnSize.length - freezeColLength > 0) {
+            overscan(this.topRight, otrw, otrh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+            overscan(this.bottomRightGrid, obrw, obrh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
+        }
+
         this.topLeftGrid.populate(leftHeader);
         this.topRightGrid.populate(rightHeader);
         this.bottomLeftGrid.populate(leftItems);

src/base/table/table.js

@@ -418,8 +418,8 @@ BI.Table = BI.inherit(BI.Widget, {
                         var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
                         if (isNeedMergeCol === true) {
                             mergeCol(i, j);
-                            preCol[j] = preRow[j - 1];
+                            preCol[j] = preRow[i];
-                            preCW[j] = preRW[j - 1];
+                            preCW[j] = preRW[i];
                         } else {
                             createOneEl(i, j);
                         }

src/case/editor/editor.sign.initial.js

@@ -1,7 +1,5 @@
 /**
- * sign是新值（初始value值）形式的自适应宽度的输入框
+ * Created by User on 2017/7/28.
- * @class BI.SignInitialEditor
- * @extends BI.Single
  */
 BI.SignInitialEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
@@ -30,8 +28,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         BI.SignInitialEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget({
-            type: "bi.sign_editor",
+            type: "bi.editor",
-            element: this,
             height: o.height,
             hgap: o.hgap,
             vgap: o.vgap,
@@ -39,7 +36,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
-            value: o.value || o.text,
+            value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
             mouseOut: o.mouseOut,
@@ -47,67 +44,163 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             errorText: o.errorText
         });
-        if(BI.isNotNull(o.value)){
+        this.text = BI.createWidget({
-            this.setState(o.value);
+            type: "bi.text_button",
+            cls: "sign-editor-text",
+            title: o.title,
+            warningTitle: o.warningTitle,
+            tipType: o.tipType,
+            textAlign: "left",
+            height: o.height,
+            hgap: 4,
+            handler: function () {
+                self._showInput();
+                self.editor.focus();
+                self.editor.selectAll();
             }
+        });
+        this.text.on(BI.TextButton.EVENT_CHANGE, function () {
+            BI.nextTick(function () {
+                self.fireEvent(BI.SignInitialEditor.EVENT_CLICK_LABEL)
+            });
+        });
+        BI.createWidget({
+            type: "bi.absolute",
+            element: this,
+            items: [{
+                el: this.text,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            }]
+        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+        this.editor.on(BI.Editor.EVENT_FOCUS, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS);
+            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_BLUR, function () {
+        this.editor.on(BI.Editor.EVENT_BLUR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR);
+            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CLICK, function () {
+        this.editor.on(BI.Editor.EVENT_CLICK, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CHANGE, function () {
+        this.editor.on(BI.Editor.EVENT_CHANGE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function (v) {
+        this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) {
-            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN);
+            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN, arguments);
         });
 
-        this.editor.on(BI.SignEditor.EVENT_VALID, function () {
+        this.editor.on(BI.Editor.EVENT_VALID, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_VALID);
+            self.fireEvent(BI.SignInitialEditor.EVENT_VALID, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CONFIRM, function () {
+        this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
-            self.setState(self.editor.getValue());
+            self._showHint();
-            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_START, function () {
+        this.editor.on(BI.Editor.EVENT_START, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_START);
+            self.fireEvent(BI.SignInitialEditor.EVENT_START, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_PAUSE, function () {
+        this.editor.on(BI.Editor.EVENT_PAUSE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_STOP, function () {
+        this.editor.on(BI.Editor.EVENT_STOP, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_STOP);
+            self.fireEvent(BI.SignInitialEditor.EVENT_STOP, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_SPACE, function () {
+        this.editor.on(BI.Editor.EVENT_SPACE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ERROR, function () {
+        this.editor.on(BI.Editor.EVENT_ERROR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ENTER, function () {
+        this.editor.on(BI.Editor.EVENT_ENTER, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER);
+            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_RESTRICT, function () {
+        this.editor.on(BI.Editor.EVENT_RESTRICT, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT);
+            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_EMPTY, function () {
+        this.editor.on(BI.Editor.EVENT_EMPTY, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY);
+            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY, arguments);
+        });
+        BI.createWidget({
+            type: "bi.vertical",
+            scrolly: false,
+            element: this,
+            items: [this.editor]
         });
+        this._showHint();
+        self._checkText();
+    },
+
+    _checkText: function () {
+        var o = this.options;
+        BI.nextTick(BI.bind(function () {
+            if (this.editor.getValue() === "") {
+                this.text.setValue(o.watermark || "");
+                this.text.element.addClass("bi-water-mark");
+            } else {
+                var v = this.editor.getValue();
+                v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
+                this.text.setValue(v);
+                this.text.element.removeClass("bi-water-mark");
+            }
+        }, this));
+    },
+
+    _showInput: function () {
+        this.editor.visible();
+        this.text.invisible();
+    },
+
+    _showHint: function () {
+        this.editor.invisible();
+        this.text.visible();
+    },
+
+    setTitle: function (title) {
+        this.text.setTitle(title);
+    },
+
+    setWarningTitle: function (title) {
+        this.text.setWarningTitle(title);
     },
 
     focus: function () {
+        this._showInput();
         this.editor.focus();
     },
 
     blur: function () {
         this.editor.blur();
+        this._showHint();
+        this._checkText();
+    },
+
+    doRedMark: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
     },
 
     isValid: function () {
@@ -122,9 +215,19 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         return this.editor.getErrorText();
     },
 
+    isEditing: function () {
+        return this.editor.isEditing();
+    },
+
+    getLastValidValue: function () {
+        return this.editor.getLastValidValue();
+    },
+
     setValue: function (v) {
+        var o = this.options;
         this.editor.setValue(v.value);
-        this.setState(v.value);
+        o.text = v.text || o.text;
+        this._checkText();
     },
 
     getValue: function () {
@@ -135,13 +238,14 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
     },
 
     getState: function () {
-        return this.editor.getState();
+        return this.text.getValue();
     },
 
     setState: function (v) {
         var o = this.options;
+        this._showHint();
         v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
-        this.editor.setState(v);
+        this.text.setValue(v);
     }
 });
 BI.SignInitialEditor.EVENT_CHANGE = "EVENT_CHANGE";

src/case/list/list.select.js

@@ -158,6 +158,11 @@ BI.SelectList = BI.inherit(BI.Widget, {
         this._checkAllSelected();
     },
 
+    _setEnable: function (enable) {
+        BI.SelectList.superclass._setEnable.apply(this, arguments);
+        this.toolbar.setEnable(enable);
+    },
+
     resetHeight: function (h) {
         var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
         this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :

src/core/base.js

@@ -1048,10 +1048,7 @@ if (!window.BI) {
             return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
         },
 
-        isIE9Below: function () {
+        getIEVersion: function () {
-            if (!BI.isIE()) {
-                return false;
-            }
             var version = 0;
             var agent = navigator.userAgent.toLowerCase();
             var v1 = agent.match(/(?:msie\s([\w.]+))/);
@@ -1065,7 +1062,18 @@ if (!window.BI) {
             } else {
                 version = 0;
             }
-            return version < 9;
+            return version;
+        },
+
+        isIE9Below: function () {
+            if (!BI.isIE()) {
+                return false;
+            }
+            return this.getIEVersion() < 9;
+        },
+
+        isIE9: function () {
+            return this.getIEVersion() === 9;
         },
 
         isEdge: function () {

src/core/widget.js

@@ -343,6 +343,13 @@ BI.Widget = BI.inherit(BI.OB, {
     },
 
     attr: function (key, value) {
+        var self = this;
+        if (BI.isPlainObject(key)) {
+            BI.each(key, function (k, v) {
+                self.attr(k, v);
+            })
+            return;
+        }
         if (BI.isNotNull(value)) {
             return this.options[key] = value;
         }

src/css/resource/font.css

@@ -12,7 +12,7 @@
   -moz-osx-font-smoothing: grayscale;
 }
 .close-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe600');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .close-font .b-font:before {
   content: "\e600";
@@ -24,7 +24,7 @@
   color: inherit;
 }
 .close-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe600');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .close-h-font .b-font:before {
   content: "\e600";
@@ -42,7 +42,7 @@
   color: inherit;
 }
 .close-ha-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe600');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .close-ha-font .b-font:before {
   content: "\e600";
@@ -65,7 +65,7 @@
   color: inherit;
 }
 .search-close-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe600');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .search-close-h-font .b-font:before {
   content: "\e600";
@@ -83,7 +83,7 @@
   color: inherit;
 }
 .pre-page-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe601');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pre-page-h-font .b-font:before {
   content: "\e601";
@@ -101,7 +101,7 @@
   color: inherit;
 }
 .next-page-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe602');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .next-page-h-font .b-font:before {
   content: "\e602";
@@ -119,7 +119,7 @@
   color: inherit;
 }
 .search-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe604');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .search-font .b-font:before {
   content: "\e604";
@@ -131,7 +131,7 @@
   color: inherit;
 }
 .dot-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe606');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .dot-font .b-font:before {
   content: "\e606";
@@ -143,7 +143,7 @@
   color: #1a1a1a;
 }
 .dot-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe606');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .dot-h-font .b-font:before {
   content: "\e606";
@@ -161,7 +161,7 @@
   color: #1a1a1a;
 }
 .dot-ha-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe606');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .dot-ha-font .b-font:before {
   content: "\e606";
@@ -184,7 +184,7 @@
   color: #ffffff;
 }
 .dot-e-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe606');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .dot-e-font .b-font:before {
   content: "\e606";
@@ -210,7 +210,7 @@
   color: #ffffff;
 }
 .pull-right-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe607');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-right-font .b-font:before {
   content: "\e607";
@@ -222,7 +222,7 @@
   color: inherit;
 }
 .pull-right-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe607');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-right-h-font .b-font:before {
   content: "\e607";
@@ -240,7 +240,7 @@
   color: inherit;
 }
 .pull-right-ha-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe607');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-right-ha-font .b-font:before {
   content: "\e607";
@@ -263,7 +263,7 @@
   color: inherit;
 }
 .pull-right-e-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe607');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-right-e-font .b-font:before {
   content: "\e607";
@@ -289,7 +289,7 @@
   color: inherit;
 }
 .copy-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe610');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .copy-font .b-font:before {
   content: "\e610";
@@ -301,7 +301,7 @@
   color: inherit;
 }
 .copy-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe610');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .copy-h-font .b-font:before {
   content: "\e610";
@@ -319,7 +319,7 @@
   color: #1a1a1a;
 }
 .copy-ha-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe610');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .copy-ha-font .b-font:before {
   content: "\e610";
@@ -342,7 +342,7 @@
   color: inherit;
 }
 .copy-e-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe610');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .copy-e-font .b-font:before {
   content: "\e610";
@@ -368,7 +368,7 @@
   color: inherit;
 }
 .check-mark-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe611');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .check-mark-font .b-font:before {
   content: "\e611";
@@ -380,7 +380,7 @@
   color: inherit;
 }
 .check-mark-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe611');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .check-mark-h-font .b-font:before {
   content: "\e611";
@@ -398,7 +398,7 @@
   color: inherit;
 }
 .check-mark-ha-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe611');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .check-mark-ha-font .b-font:before {
   content: "\e611";
@@ -421,7 +421,7 @@
   color: inherit;
 }
 .check-mark-e-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe611');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .check-mark-e-font .b-font:before {
   content: "\e611";
@@ -448,7 +448,7 @@
 }
 /** dashboard组件/控件 下拉列表图标字体 ~end~**/
 .tree-node-triangle-expand-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe608');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .tree-node-triangle-expand-font .b-font:before {
   content: "\e608";
@@ -460,7 +460,7 @@
   color: inherit;
 }
 .tree-node-triangle-collapse-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe607');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .tree-node-triangle-collapse-font .b-font:before {
   content: "\e607";
@@ -472,7 +472,7 @@
   color: inherit;
 }
 .row-pre-page-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6be');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .row-pre-page-h-font .b-font:before {
   content: "\e6be";
@@ -490,7 +490,7 @@
   color: inherit;
 }
 .row-next-page-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6bd');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .row-next-page-h-font .b-font:before {
   content: "\e6bd";
@@ -508,7 +508,7 @@
   color: inherit;
 }
 .column-pre-page-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6bc');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .column-pre-page-h-font .b-font:before {
   content: "\e6bc";
@@ -526,7 +526,7 @@
   color: inherit;
 }
 .column-next-page-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6bb');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .column-next-page-h-font .b-font:before {
   content: "\e6bb";
@@ -544,7 +544,7 @@
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe66a');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .trigger-triangle-font .b-font:before {
   content: "\e66a";
@@ -567,7 +567,7 @@
   color: #999999;
 }
 .pull-down-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe608');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-down-font .b-font:before {
   content: "\e608";
@@ -579,7 +579,7 @@
   color: inherit;
 }
 .pull-down-h-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe608');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-down-h-font .b-font:before {
   content: "\e608";
@@ -597,7 +597,7 @@
   color: inherit;
 }
 .pull-down-ha-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe608');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .pull-down-ha-font .b-font:before {
   content: "\e608";
@@ -620,7 +620,7 @@
   color: inherit;
 }
 .check-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe611');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .check-font .b-font:before {
   content: "\e611";
@@ -632,7 +632,7 @@
   color: #3f8ce8;
 }
 .item-check-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe611');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .item-check-font .b-font:before {
   content: "\e611";
@@ -655,7 +655,7 @@
   color: #ffffff;
 }
 .primary-key-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';');
 }
 .primary-key-font .b-font:before {
   content: "\e67d;";
@@ -673,7 +673,7 @@
   color: inherit;
 }
 .drag-tag-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe600');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .drag-tag-font .b-font:before {
   content: "\e600";
@@ -684,16 +684,49 @@
   content: "\e600";
   color: #f07d0a;
 }
-
+.less-font .b-font {
-.chart-date-normal-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.less-font .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-font:hover .b-font:before,
+.less-font:focus .b-font:before,
+.less-font.hover .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-font:active .b-font:before,
+.less-font.active .b-font:before {
+  content: "\e633";
+  color: #3f8ce8;
 }
-.chart-date-normal-font .b-font:before {
+.less-font.native .b-font:before,
-  content: "\e61b";
+.less-font.disabled .b-font:before {
+  content: "\e633";
   color: inherit;
 }
-.chart-date-normal-font.native .b-font:before,
+.less-equal-font .b-font {
-.chart-date-normal-font.disabled .b-font:before {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
-  content: "\e61b";
+}
+.less-equal-font .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
+.less-equal-font:hover .b-font:before,
+.less-equal-font:focus .b-font:before,
+.less-equal-font.hover .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
+.less-equal-font:active .b-font:before,
+.less-equal-font.active .b-font:before {
+  content: "\e636";
+  color: #3f8ce8;
+}
+.less-equal-font.native .b-font:before,
+.less-equal-font.disabled .b-font:before {
+  content: "\e636";
   color: inherit;
 }

src/css/resource/icon.css

@@ -6,6 +6,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png');
   _background: none;
 }
+.tree-collapse-icon-type1 .x-icon.hack,
+.tree-collapse-icon-type1:hover .x-icon.hack,
+.tree-collapse-icon-type1:active .x-icon.hack {
+  background: url('icon/tree-collapse-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png');
+  _background: none;
+}
 .tree-collapse-icon-type1.native .x-icon,
 .tree-collapse-icon-type1.disabled .x-icon {
   display: block;
@@ -13,6 +20,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png');
   _background: none;
 }
+.tree-collapse-icon-type1.native .x-icon.hack,
+.tree-collapse-icon-type1.disabled .x-icon.hack {
+  background: url('icon/tree-collapse-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png');
+  _background: none;
+}
 .tree-collapse-icon-type2 .x-icon,
 .tree-collapse-icon-type2:hover .x-icon,
 .tree-collapse-icon-type2:active .x-icon {
@@ -21,6 +34,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png');
   _background: none;
 }
+.tree-collapse-icon-type2 .x-icon.hack,
+.tree-collapse-icon-type2:hover .x-icon.hack,
+.tree-collapse-icon-type2:active .x-icon.hack {
+  background: url('icon/tree-collapse-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png');
+  _background: none;
+}
 .tree-collapse-icon-type2.native .x-icon,
 .tree-collapse-icon-type2.disabled .x-icon {
   display: block;
@@ -28,6 +48,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png');
   _background: none;
 }
+.tree-collapse-icon-type2.native .x-icon.hack,
+.tree-collapse-icon-type2.disabled .x-icon.hack {
+  background: url('icon/tree-collapse-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png');
+  _background: none;
+}
 .tree-collapse-icon-type3 .x-icon,
 .tree-collapse-icon-type3:hover .x-icon,
 .tree-collapse-icon-type3:active .x-icon {
@@ -36,6 +62,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png');
   _background: none;
 }
+.tree-collapse-icon-type3 .x-icon.hack,
+.tree-collapse-icon-type3:hover .x-icon.hack,
+.tree-collapse-icon-type3:active .x-icon.hack {
+  background: url('icon/tree-collapse-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png');
+  _background: none;
+}
 .tree-collapse-icon-type3.native .x-icon,
 .tree-collapse-icon-type3.disabled .x-icon {
   display: block;
@@ -43,6 +76,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png');
   _background: none;
 }
+.tree-collapse-icon-type3.native .x-icon.hack,
+.tree-collapse-icon-type3.disabled .x-icon.hack {
+  background: url('icon/tree-collapse-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png');
+  _background: none;
+}
 .tree-collapse-icon-type4 .x-icon,
 .tree-collapse-icon-type4:hover .x-icon,
 .tree-collapse-icon-type4:active .x-icon {
@@ -51,6 +90,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png');
   _background: none;
 }
+.tree-collapse-icon-type4 .x-icon.hack,
+.tree-collapse-icon-type4:hover .x-icon.hack,
+.tree-collapse-icon-type4:active .x-icon.hack {
+  background: url('icon/tree-collapse-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png');
+  _background: none;
+}
 .tree-collapse-icon-type4.native .x-icon,
 .tree-collapse-icon-type4.disabled .x-icon {
   display: block;
@@ -58,6 +104,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png');
   _background: none;
 }
+.tree-collapse-icon-type4.native .x-icon.hack,
+.tree-collapse-icon-type4.disabled .x-icon.hack {
+  background: url('icon/tree-collapse-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png');
+  _background: none;
+}
 .tree-expand-icon-type1 .x-icon,
 .tree-expand-icon-type1:hover .x-icon,
 .tree-expand-icon-type1:active .x-icon {
@@ -66,6 +118,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png');
   _background: none;
 }
+.tree-expand-icon-type1 .x-icon.hack,
+.tree-expand-icon-type1:hover .x-icon.hack,
+.tree-expand-icon-type1:active .x-icon.hack {
+  background: url('icon/tree-expand-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png');
+  _background: none;
+}
 .tree-expand-icon-type1.native .x-icon,
 .tree-expand-icon-type1.disabled .x-icon {
   display: block;
@@ -73,6 +132,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png');
   _background: none;
 }
+.tree-expand-icon-type1.native .x-icon.hack,
+.tree-expand-icon-type1.disabled .x-icon.hack {
+  background: url('icon/tree-expand-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png');
+  _background: none;
+}
 .tree-expand-icon-type2 .x-icon,
 .tree-expand-icon-type2:hover .x-icon,
 .tree-expand-icon-type2:active .x-icon {
@@ -81,6 +146,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png');
   _background: none;
 }
+.tree-expand-icon-type2 .x-icon.hack,
+.tree-expand-icon-type2:hover .x-icon.hack,
+.tree-expand-icon-type2:active .x-icon.hack {
+  background: url('icon/tree-expand-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png');
+  _background: none;
+}
 .tree-expand-icon-type2.native .x-icon,
 .tree-expand-icon-type2.disabled .x-icon {
   display: block;
@@ -88,6 +160,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png');
   _background: none;
 }
+.tree-expand-icon-type2.native .x-icon.hack,
+.tree-expand-icon-type2.disabled .x-icon.hack {
+  background: url('icon/tree-expand-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png');
+  _background: none;
+}
 .tree-expand-icon-type3 .x-icon,
 .tree-expand-icon-type3:hover .x-icon,
 .tree-expand-icon-type3:active .x-icon {
@@ -96,6 +174,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png');
   _background: none;
 }
+.tree-expand-icon-type3 .x-icon.hack,
+.tree-expand-icon-type3:hover .x-icon.hack,
+.tree-expand-icon-type3:active .x-icon.hack {
+  background: url('icon/tree-expand-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png');
+  _background: none;
+}
 .tree-expand-icon-type3.native .x-icon,
 .tree-expand-icon-type3.disabled .x-icon {
   display: block;
@@ -103,6 +188,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png');
   _background: none;
 }
+.tree-expand-icon-type3.native .x-icon.hack,
+.tree-expand-icon-type3.disabled .x-icon.hack {
+  background: url('icon/tree-expand-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png');
+  _background: none;
+}
 .tree-expand-icon-type4 .x-icon,
 .tree-expand-icon-type4:hover .x-icon,
 .tree-expand-icon-type4:active .x-icon {
@@ -111,6 +202,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png');
   _background: none;
 }
+.tree-expand-icon-type4 .x-icon.hack,
+.tree-expand-icon-type4:hover .x-icon.hack,
+.tree-expand-icon-type4:active .x-icon.hack {
+  background: url('icon/tree-expand-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png');
+  _background: none;
+}
 .tree-expand-icon-type4.native .x-icon,
 .tree-expand-icon-type4.disabled .x-icon {
   display: block;
@@ -118,6 +216,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png');
   _background: none;
 }
+.tree-expand-icon-type4.native .x-icon.hack,
+.tree-expand-icon-type4.disabled .x-icon.hack {
+  background: url('icon/tree-expand-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png');
+  _background: none;
+}
 .tree-vertical-line-type2 .x-icon,
 .tree-vertical-line-type2:hover .x-icon,
 .tree-vertical-line-type2:active .x-icon {
@@ -126,6 +230,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png');
   _background: none;
 }
+.tree-vertical-line-type2 .x-icon.hack,
+.tree-vertical-line-type2:hover .x-icon.hack,
+.tree-vertical-line-type2:active .x-icon.hack {
+  background: url('icon/tree-vertical-line-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png');
+  _background: none;
+}
 .tree-vertical-line-type2.native .x-icon,
 .tree-vertical-line-type2.disabled .x-icon {
   display: block;
@@ -133,6 +244,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png');
   _background: none;
 }
+.tree-vertical-line-type2.native .x-icon.hack,
+.tree-vertical-line-type2.disabled .x-icon.hack {
+  background: url('icon/tree-vertical-line-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png');
+  _background: none;
+}
 .tree-vertical-line-type3 .x-icon,
 .tree-vertical-line-type3:hover .x-icon,
 .tree-vertical-line-type3:active .x-icon {
@@ -141,6 +258,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png');
   _background: none;
 }
+.tree-vertical-line-type3 .x-icon.hack,
+.tree-vertical-line-type3:hover .x-icon.hack,
+.tree-vertical-line-type3:active .x-icon.hack {
+  background: url('icon/tree-vertical-line-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png');
+  _background: none;
+}
 .tree-vertical-line-type3.native .x-icon,
 .tree-vertical-line-type3.disabled .x-icon {
   display: block;
@@ -148,6 +272,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png');
   _background: none;
 }
+.tree-vertical-line-type3.native .x-icon.hack,
+.tree-vertical-line-type3.disabled .x-icon.hack {
+  background: url('icon/tree-vertical-line-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png');
+  _background: none;
+}
 .tree-vertical-line-type4 .x-icon,
 .tree-vertical-line-type4:hover .x-icon,
 .tree-vertical-line-type4:active .x-icon {
@@ -156,6 +286,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png');
   _background: none;
 }
+.tree-vertical-line-type4 .x-icon.hack,
+.tree-vertical-line-type4:hover .x-icon.hack,
+.tree-vertical-line-type4:active .x-icon.hack {
+  background: url('icon/tree-vertical-line-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png');
+  _background: none;
+}
 .tree-vertical-line-type4.native .x-icon,
 .tree-vertical-line-type4.disabled .x-icon {
   display: block;
@@ -163,6 +300,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png');
   _background: none;
 }
+.tree-vertical-line-type4.native .x-icon.hack,
+.tree-vertical-line-type4.disabled .x-icon.hack {
+  background: url('icon/tree-vertical-line-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type1 .x-icon,
 .bi-theme-dark .tree-collapse-icon-type1:hover .x-icon,
 .bi-theme-dark .tree-collapse-icon-type1:active .x-icon {
@@ -171,6 +314,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type1 .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type1:hover .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type1:active .x-icon.hack {
+  background: url('icon/dark/tree-collapse-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type1.native .x-icon,
 .bi-theme-dark .tree-collapse-icon-type1.disabled .x-icon {
   display: block;
@@ -178,6 +328,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type1.native .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type1.disabled .x-icon.hack {
+  background: url('icon/dark/tree-collapse-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type2 .x-icon,
 .bi-theme-dark .tree-collapse-icon-type2:hover .x-icon,
 .bi-theme-dark .tree-collapse-icon-type2:active .x-icon {
@@ -186,6 +342,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type2 .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type2:hover .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type2:active .x-icon.hack {
+  background: url('icon/dark/tree-collapse-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type2.native .x-icon,
 .bi-theme-dark .tree-collapse-icon-type2.disabled .x-icon {
   display: block;
@@ -193,6 +356,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type2.native .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type2.disabled .x-icon.hack {
+  background: url('icon/dark/tree-collapse-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type3 .x-icon,
 .bi-theme-dark .tree-collapse-icon-type3:hover .x-icon,
 .bi-theme-dark .tree-collapse-icon-type3:active .x-icon {
@@ -201,6 +370,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type3 .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type3:hover .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type3:active .x-icon.hack {
+  background: url('icon/dark/tree-collapse-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type3.native .x-icon,
 .bi-theme-dark .tree-collapse-icon-type3.disabled .x-icon {
   display: block;
@@ -208,6 +384,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type3.native .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type3.disabled .x-icon.hack {
+  background: url('icon/dark/tree-collapse-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type4 .x-icon,
 .bi-theme-dark .tree-collapse-icon-type4:hover .x-icon,
 .bi-theme-dark .tree-collapse-icon-type4:active .x-icon {
@@ -216,6 +398,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type4 .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type4:hover .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type4:active .x-icon.hack {
+  background: url('icon/dark/tree-collapse-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png');
+  _background: none;
+}
 .bi-theme-dark .tree-collapse-icon-type4.native .x-icon,
 .bi-theme-dark .tree-collapse-icon-type4.disabled .x-icon {
   display: block;
@@ -223,6 +412,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png');
   _background: none;
 }
+.bi-theme-dark .tree-collapse-icon-type4.native .x-icon.hack,
+.bi-theme-dark .tree-collapse-icon-type4.disabled .x-icon.hack {
+  background: url('icon/dark/tree-collapse-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type1 .x-icon,
 .bi-theme-dark .tree-expand-icon-type1:hover .x-icon,
 .bi-theme-dark .tree-expand-icon-type1:active .x-icon {
@@ -231,6 +426,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type1 .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type1:hover .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type1:active .x-icon.hack {
+  background: url('icon/dark/tree-expand-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type1.native .x-icon,
 .bi-theme-dark .tree-expand-icon-type1.disabled .x-icon {
   display: block;
@@ -238,6 +440,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type1.native .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type1.disabled .x-icon.hack {
+  background: url('icon/dark/tree-expand-1.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type2 .x-icon,
 .bi-theme-dark .tree-expand-icon-type2:hover .x-icon,
 .bi-theme-dark .tree-expand-icon-type2:active .x-icon {
@@ -246,6 +454,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type2 .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type2:hover .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type2:active .x-icon.hack {
+  background: url('icon/dark/tree-expand-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type2.native .x-icon,
 .bi-theme-dark .tree-expand-icon-type2.disabled .x-icon {
   display: block;
@@ -253,6 +468,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type2.native .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type2.disabled .x-icon.hack {
+  background: url('icon/dark/tree-expand-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type3 .x-icon,
 .bi-theme-dark .tree-expand-icon-type3:hover .x-icon,
 .bi-theme-dark .tree-expand-icon-type3:active .x-icon {
@@ -261,6 +482,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type3 .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type3:hover .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type3:active .x-icon.hack {
+  background: url('icon/dark/tree-expand-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type3.native .x-icon,
 .bi-theme-dark .tree-expand-icon-type3.disabled .x-icon {
   display: block;
@@ -268,6 +496,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type3.native .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type3.disabled .x-icon.hack {
+  background: url('icon/dark/tree-expand-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type4 .x-icon,
 .bi-theme-dark .tree-expand-icon-type4:hover .x-icon,
 .bi-theme-dark .tree-expand-icon-type4:active .x-icon {
@@ -276,6 +510,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type4 .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type4:hover .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type4:active .x-icon.hack {
+  background: url('icon/dark/tree-expand-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png');
+  _background: none;
+}
 .bi-theme-dark .tree-expand-icon-type4.native .x-icon,
 .bi-theme-dark .tree-expand-icon-type4.disabled .x-icon {
   display: block;
@@ -283,6 +524,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png');
   _background: none;
 }
+.bi-theme-dark .tree-expand-icon-type4.native .x-icon.hack,
+.bi-theme-dark .tree-expand-icon-type4.disabled .x-icon.hack {
+  background: url('icon/dark/tree-expand-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png');
+  _background: none;
+}
 .bi-theme-dark .tree-vertical-line-type2 .x-icon,
 .bi-theme-dark .tree-vertical-line-type2:hover .x-icon,
 .bi-theme-dark .tree-vertical-line-type2:active .x-icon {
@@ -291,6 +538,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png');
   _background: none;
 }
+.bi-theme-dark .tree-vertical-line-type2 .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type2:hover .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type2:active .x-icon.hack {
+  background: url('icon/dark/tree-vertical-line-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png');
+  _background: none;
+}
 .bi-theme-dark .tree-vertical-line-type2.native .x-icon,
 .bi-theme-dark .tree-vertical-line-type2.disabled .x-icon {
   display: block;
@@ -298,6 +552,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png');
   _background: none;
 }
+.bi-theme-dark .tree-vertical-line-type2.native .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type2.disabled .x-icon.hack {
+  background: url('icon/dark/tree-vertical-line-2.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png');
+  _background: none;
+}
 .bi-theme-dark .tree-vertical-line-type3 .x-icon,
 .bi-theme-dark .tree-vertical-line-type3:hover .x-icon,
 .bi-theme-dark .tree-vertical-line-type3:active .x-icon {
@@ -306,6 +566,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png');
   _background: none;
 }
+.bi-theme-dark .tree-vertical-line-type3 .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type3:hover .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type3:active .x-icon.hack {
+  background: url('icon/dark/tree-vertical-line-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png');
+  _background: none;
+}
 .bi-theme-dark .tree-vertical-line-type3.native .x-icon,
 .bi-theme-dark .tree-vertical-line-type3.disabled .x-icon {
   display: block;
@@ -313,6 +580,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png');
   _background: none;
 }
+.bi-theme-dark .tree-vertical-line-type3.native .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type3.disabled .x-icon.hack {
+  background: url('icon/dark/tree-vertical-line-3.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png');
+  _background: none;
+}
 .bi-theme-dark .tree-vertical-line-type4 .x-icon,
 .bi-theme-dark .tree-vertical-line-type4:hover .x-icon,
 .bi-theme-dark .tree-vertical-line-type4:active .x-icon {
@@ -321,6 +594,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png');
   _background: none;
 }
+.bi-theme-dark .tree-vertical-line-type4 .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type4:hover .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type4:active .x-icon.hack {
+  background: url('icon/dark/tree-vertical-line-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png');
+  _background: none;
+}
 .bi-theme-dark .tree-vertical-line-type4.native .x-icon,
 .bi-theme-dark .tree-vertical-line-type4.disabled .x-icon {
   display: block;
@@ -328,12 +608,23 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png');
   _background: none;
 }
+.bi-theme-dark .tree-vertical-line-type4.native .x-icon.hack,
+.bi-theme-dark .tree-vertical-line-type4.disabled .x-icon.hack {
+  background: url('icon/dark/tree-vertical-line-4.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png');
+  _background: none;
+}
 .check-box-icon .x-icon {
   display: block;
   background: url('icon/check-box-normal.png') no-repeat 0 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png');
   _background: none;
 }
+.check-box-icon .x-icon.hack {
+  background: url('icon/check-box-normal.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png');
+  _background: none;
+}
 .check-box-icon:hover .x-icon,
 .check-box-icon:focus .x-icon,
 .check-box-icon.hover .x-icon {
@@ -342,6 +633,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png');
   _background: none;
 }
+.check-box-icon:hover .x-icon.hack,
+.check-box-icon:focus .x-icon.hack,
+.check-box-icon.hover .x-icon.hack {
+  background: url('icon/check-box-normal.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png');
+  _background: none;
+}
 .check-box-icon:active .x-icon,
 .check-box-icon.active .x-icon {
   display: block;
@@ -349,6 +647,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-active.png');
   _background: none;
 }
+.check-box-icon:active .x-icon.hack,
+.check-box-icon.active .x-icon.hack {
+  background: url('icon/check-box-active.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-active.png');
+  _background: none;
+}
 .check-box-icon.native .x-icon,
 .check-box-icon.disabled .x-icon {
   display: block;
@@ -356,6 +660,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable.png');
   _background: none;
 }
+.check-box-icon.native .x-icon.hack,
+.check-box-icon.disabled .x-icon.hack {
+  background: url('icon/check-box-disable.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable.png');
+  _background: none;
+}
 .check-box-icon.native .x-icon,
 .check-box-icon.disabled.active .x-icon {
   display: block;
@@ -363,12 +673,23 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable2.png');
   _background: none;
 }
+.check-box-icon.native .x-icon.hack,
+.check-box-icon.disabled.active .x-icon.hack {
+  background: url('icon/check-box-disable2.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable2.png');
+  _background: none;
+}
 .radio-icon .x-icon {
   display: block;
   background: url('icon/radio-normal.png') no-repeat 0 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png');
   _background: none;
 }
+.radio-icon .x-icon.hack {
+  background: url('icon/radio-normal.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png');
+  _background: none;
+}
 .radio-icon:hover .x-icon,
 .radio-icon:focus .x-icon,
 .radio-icon.hover .x-icon {
@@ -377,6 +698,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png');
   _background: none;
 }
+.radio-icon:hover .x-icon.hack,
+.radio-icon:focus .x-icon.hack,
+.radio-icon.hover .x-icon.hack {
+  background: url('icon/radio-normal.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png');
+  _background: none;
+}
 .radio-icon:active .x-icon,
 .radio-icon.active .x-icon {
   display: block;
@@ -384,6 +712,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-active.png');
   _background: none;
 }
+.radio-icon:active .x-icon.hack,
+.radio-icon.active .x-icon.hack {
+  background: url('icon/radio-active.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-active.png');
+  _background: none;
+}
 .radio-icon.native .x-icon,
 .radio-icon.disabled .x-icon {
   display: block;
@@ -391,6 +725,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable.png');
   _background: none;
 }
+.radio-icon.native .x-icon.hack,
+.radio-icon.disabled .x-icon.hack {
+  background: url('icon/radio-disable.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable.png');
+  _background: none;
+}
 .radio-icon.native .x-icon,
 .radio-icon.disabled.active .x-icon {
   display: block;
@@ -398,6 +738,12 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable2.png');
   _background: none;
 }
+.radio-icon.native .x-icon.hack,
+.radio-icon.disabled.active .x-icon.hack {
+  background: url('icon/radio-disable2.png') no-repeat 0 0;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable2.png');
+  _background: none;
+}
 .check-half-select-icon .x-icon,
 .check-half-select-icon:hover .x-icon,
 .check-half-select-icon:active .x-icon {
@@ -406,6 +752,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png');
   _background: none;
 }
+.check-half-select-icon .x-icon.hack,
+.check-half-select-icon:hover .x-icon.hack,
+.check-half-select-icon:active .x-icon.hack {
+  background: url('icon/half_selected.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png');
+  _background: none;
+}
 .check-half-select-icon.native .x-icon,
 .check-half-select-icon.disabled .x-icon {
   display: block;
@@ -413,3 +766,9 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png');
   _background: none;
 }
+.check-half-select-icon.native .x-icon.hack,
+.check-half-select-icon.disabled .x-icon.hack {
+  background: url('icon/half_selected.png') no-repeat 0px 0px;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png');
+  _background: none;
+}

src/less/image.less

@@ -11,42 +11,63 @@
   _background: none;
 }
 
+.image2xPath(@path, @top:center, @left:center, @repeat: no-repeat) when not (@path = none) {
+  background: url('@{image2xUrl}@{path}') @repeat @left @top;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='@{image2xUrl}@{path}');
+  _background: none;
+}
+
 .icon(@class, @iconPath, @top:0px, @left:0px) {
   .@{class} {
     & .x-icon,
     &:hover .x-icon,
     &:active .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
+    }
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
     }
+  }
 }
 
 .icon_hover(@class, @iconPath, @top:0px, @left:0px, @distance: 20) {
   .@{class} {
     & .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
+    }
     &:hover .x-icon,
     &:focus .x-icon,
     &.hover .x-icon,
     &:active .x-icon,
     &.active .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -(@left + @distance));
+      &.hack {
         .imagePath(@iconPath, -@top, -(@left + @distance));
       }
+    }
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
     }
+  }
 }
 
 .icon_active(@class, @iconPath, @top:0px, @left:0px, @distance: 20) {
@@ -56,115 +77,169 @@
     &:focus .x-icon,
     &.hover .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
+    }
     &:active .x-icon,
     &.active .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -(@left + @distance));
+      &.hack {
         .imagePath(@iconPath, -@top, -(@left + @distance));
       }
+    }
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
     }
+  }
 }
 
 .icon_hover_active(@class, @iconPath, @top:0px, @left:0px, @distance: 20) {
   .@{class} {
     & .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
+    }
     &:hover .x-icon,
     &:focus .x-icon,
     &.hover .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -(@left+@distance));
+      &.hack {
         .imagePath(@iconPath, -@top, -(@left+@distance));
       }
+    }
 
     &:active .x-icon,
     &.active .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -(@left+@distance*2));
+      &.hack {
         .imagePath(@iconPath, -@top, -(@left+@distance*2));
       }
+    }
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
     }
+  }
 }
 
 .icon_select(@class, @iconPath, @top:0px, @left:0px, @distance: 20) {
   .@{class} {
     & .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
+    }
     &.active .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -(@left+@distance));
+      &.hack {
         .imagePath(@iconPath, -@top, -(@left+@distance));
       }
+    }
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@iconPath, -@top, -@left);
+      &.hack {
         .imagePath(@iconPath, -@top, -@left);
       }
     }
+  }
 }
 
 .icon_custom(@class, @iconPath, @hoverPath:none, @activePath:none, @disablePath:none, @activeDisablePath:none) {
   .@{class} {
     & .x-icon {
       display: block;
+      .image2xPath(@iconPath, 0, 0);
+      &.hack {
         .imagePath(@iconPath, 0, 0);
       }
+    }
     &:hover .x-icon,
     &:focus .x-icon,
     &.hover .x-icon {
       display: block;
+      .image2xPath(@hoverPath, 0, 0);
+      &.hack {
         .imagePath(@hoverPath, 0, 0);
       }
+    }
 
     &:active .x-icon,
     &.active .x-icon {
       display: block;
+      .image2xPath(@activePath, 0, 0);
+      &.hack {
         .imagePath(@activePath, 0, 0);
       }
+    }
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@disablePath, 0, 0);
+      &.hack {
         .imagePath(@disablePath, 0, 0);
       }
+    }
     &.native .x-icon,
     &.disabled.active .x-icon {
       display: block;
+      .image2xPath(@activeDisablePath, 0, 0);
+      &.hack {
         .imagePath(@activeDisablePath, 0, 0);
       }
     }
+  }
 }
 
 .icon_custom_hover(@class, @iconPath, @hoverPath:none, @disablePath:none) {
   .@{class} {
     & .x-icon {
       display: block;
+      .image2xPath(@iconPath, 0, 0);
+      &.hack {
         .imagePath(@iconPath, 0, 0);
       }
+    }
     &:hover .x-icon,
     &:focus .x-icon,
     &.hover .x-icon {
       display: block;
+      .image2xPath(@hoverPath, 0, 0);
+      &.hack {
         .imagePath(@hoverPath, 0, 0);
       }
+    }
 
     &.native .x-icon,
     &.disabled .x-icon {
       display: block;
+      .image2xPath(@disablePath, 0, 0);
+      &.hack {
         .imagePath(@disablePath, 0, 0);
       }
     }
+  }
 }
 
 //
@@ -177,8 +252,8 @@
 .font(@class,@content, @color: @color-bi-font-native) {
   @fc: "\@{content}";
   .@{class} {
-    & .b-font{
+    & .b-font {
-      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')";
+      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')";
     }
     & .b-font:before {
       content: @fc;
@@ -195,8 +270,8 @@
 .font-hover(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover) {
   @fc: "\@{content}";
   .@{class} {
-    & .b-font{
+    & .b-font {
-      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')";
+      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')";
     }
     & .b-font:before {
       content: @fc;
@@ -219,8 +294,8 @@
 .font-effect(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active, @color-selected: @color-bi-font-active) {
   @fc: "\@{content}";
   .@{class} {
-    & .b-font{
+    & .b-font {
-      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')";
+      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')";
     }
     & .b-font:before {
       content: @fc;
@@ -251,8 +326,8 @@
 .font-hover-active(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active) {
   @fc: "\@{content}";
   .@{class} {
-    & .b-font{
+    & .b-font {
-      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')";
+      *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')";
     }
     & .b-font:before {
       content: @fc;

src/less/resource/font.less

@@ -80,3 +80,7 @@
 .font-hover(primary-key-font, @font-key);
 
 .font(drag-tag-font, @font-cross, @color-bi-text-redmark);
+
+//数值区间
+.font-hover-active(less-font, @font-less);
+.font-hover-active(less-equal-font, @font-less-equal);

src/less/var.less

@@ -1,5 +1,6 @@
 @webUrl: '';
 @imageUrl: ''; //图片的基本地址
+@image2xUrl: ''; //图片的基本地址
 
 @cursor: '@{imageUrl}cursor/cursor_hand.cur';
 @dragCursor: '@{imageUrl}cursor/cursor_drag_hand.cur';

src/widget/adaptivearrangement/adaptivearrangement.js

@@ -210,7 +210,12 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
                     clearInterval(self._scrollInterval);
                     self._scrollInterval = null;
                 }
+                var count = 0;
                 self._scrollInterval = setInterval(function () {
+                    count++;
+                    if (count <= 3) {
+                        return;
+                    }
                     var offset = self._getScrollOffset();
                     var t = offset.top + map[direction][0] * 40;
                     var l = offset.left + map[direction][1] * 40;

src/widget/date/calendar/popup.calendar.date.js

@@ -27,12 +27,13 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
             month: date.month,
             day: this.selectedTime.day
         });
-        return calendar;
+        return calendar
     },
 
     _init: function () {
         BI.DateCalendarPopup.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
+        var self = this,
+            o = this.options;
         this.today = new Date();
         this._year = this.today.getFullYear();
         this._month = this.today.getMonth();

src/widget/date/combo.date.js

@@ -14,7 +14,8 @@ BI.DateCombo = BI.inherit(BI.Widget, {
     },
     _init: function () {
         BI.DateCombo.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
+        var self = this,
+            o = this.options;
 
         this.trigger = BI.createWidget({
             type: "bi.date_trigger"

src/widget/filemanager/nav/button/button.nav.filemanager.js

@@ -9,7 +9,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, {
 
     _const: {
         normal_color: "#ffffff",
-        select_color: "#f4f4f4"
+        select_color: "#eff1f4"
     },
     _defaultConfig: function () {
         return BI.extend(BI.FileManagerNavButton.superclass._defaultConfig.apply(this, arguments), {