Merge pull request #450 in FUI/fineui from ~WINDY/fui:master to master

* commit '1ec8b2a1d96ce569bd36987ff60618ddc2efd974': update BI-24459 update BI-24473 BI-24461 BI-24464
7 years ago · 207201e5cc
94 changed files with 322 additions and 268 deletions
--- a/demo/js/widget/singleselct/demo.single_select_combo.js
+++ b/demo/js/widget/singleselct/demo.single_select_combo.js
@ -29,14 +29,14 @@ Demo.SingleSelectCombo = BI.inherit(BI.Widget, {

    _getItemsByTimes: function (items, times) {
        var res = [];
-        for (var i = (times - 1) * 10; items[i] && i < times * 10; i++) {
+        for (var i = (times - 1) * 100; items[i] && i < times * 100; i++) {
            res.push(items[i]);
        }
        return res;
    },

    _hasNextByTimes: function (items, times) {
-        return times * 10 < items.length;
+        return times * 100 < items.length;
    },

    _itemsCreator: function (options, callback) {
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.css
+++ b/dist/base.css
@ -1311,7 +1311,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 }

 .bi-toast {
-  font-size: 14px;
  color: #ffffff;
  max-width: 400px;
  min-width: 150px;
@ -1896,10 +1895,10 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -439,6 +439,15 @@ textarea {
 .bi-high-light .bi-textarea {
  color: #3685f2;
 }
+.bi-error {
+  color: #ff4949;
+}
+.bi-error .bi-input {
+  color: #ff4949;
+}
+.bi-error .bi-textarea {
+  color: #ff4949;
+}
 .bi-high-light-background {
  background-color: #3685f2;
  color: #ffffff;
@ -449,6 +458,16 @@ textarea {
 .bi-high-light-background .bi-textarea {
  color: #ffffff;
 }
+.bi-error-background {
+  background-color: #ff4949;
+  color: #ffffff;
+}
+.bi-error-background .bi-input {
+  color: #ffffff;
+}
+.bi-error-background .bi-textarea {
+  color: #ffffff;
+}
 .bi-high-light-border {
  border-color: #3685f2;
 }
@ -2989,7 +3008,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 }

 .bi-toast {
-  font-size: 14px;
  color: #ffffff;
  max-width: 400px;
  min-width: 150px;
@ -3574,10 +3592,10 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -72918,7 +72918,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -72969,7 +72969,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73002,7 +73002,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73151,7 +73151,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73184,7 +73184,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73232,7 +73232,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73265,7 +73265,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73522,7 +73522,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73551,19 +73551,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -73713,7 +73713,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73742,19 +73742,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -73817,7 +73817,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73846,19 +73846,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -91204,7 +91204,7 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -91965,7 +91965,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -94491,7 +94491,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
 }());/**
 * Created by zcf on 2016/9/26.
 */
-BI.IntervalSlider = BI.inherit(BI.Widget, {
+BI.IntervalSlider = BI.inherit(BI.Single, {
    _constant: {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
@ -97524,7 +97524,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -97908,7 +97908,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -98275,7 +98275,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -101323,10 +101323,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {

    constants: {
        offset: {
-            top: 1,
-            left: 1,
-            right: 2,
-            bottom: 33
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 31
        }
    },

@ -106236,14 +106236,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
@ -106514,14 +106506,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
@ -109997,7 +109981,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Year"),
                        ref: function () {
@ -110748,7 +110732,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Month"),
                        ref: function () {
@ -111723,7 +111707,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Quarter"),
                        ref: function () {
@ -111987,7 +111971,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
        });
        editor.on(BI.SignEditor.EVENT_CHANGE, function () {
            if(isYear) {
-                self._autoSwitch(editor.getValue());
+                self._autoSwitch(editor);
            }
        });

@ -112020,6 +112004,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
        if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
            if (v.length === 4 && this._yearCheck(v)) {
                this._doEditorConfirm(editor);
+                this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
                this.quarterEditor.focus();
            }
        }
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -447,7 +447,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -498,7 +498,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -531,7 +531,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -680,7 +680,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -713,7 +713,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -761,7 +761,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -794,7 +794,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -1051,7 +1051,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -1080,19 +1080,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -1242,7 +1242,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -1271,19 +1271,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -1346,7 +1346,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -1375,19 +1375,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
--- a/dist/core.css
+++ b/dist/core.css
@ -439,6 +439,15 @@ textarea {
 .bi-high-light .bi-textarea {
  color: #3685f2;
 }
+.bi-error {
+  color: #ff4949;
+}
+.bi-error .bi-input {
+  color: #ff4949;
+}
+.bi-error .bi-textarea {
+  color: #ff4949;
+}
 .bi-high-light-background {
  background-color: #3685f2;
  color: #ffffff;
@ -449,6 +458,16 @@ textarea {
 .bi-high-light-background .bi-textarea {
  color: #ffffff;
 }
+.bi-error-background {
+  background-color: #ff4949;
+  color: #ffffff;
+}
+.bi-error-background .bi-input {
+  color: #ffffff;
+}
+.bi-error-background .bi-textarea {
+  color: #ffffff;
+}
 .bi-high-light-border {
  border-color: #3685f2;
 }
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -161,6 +161,15 @@ textarea {
 .bi-high-light .bi-textarea {
  color: #3685f2;
 }
+.bi-error {
+  color: #ff4949;
+}
+.bi-error .bi-input {
+  color: #ff4949;
+}
+.bi-error .bi-textarea {
+  color: #ff4949;
+}
 .bi-high-light-background {
  background-color: #3685f2;
  color: #ffffff;
@ -171,6 +180,16 @@ textarea {
 .bi-high-light-background .bi-textarea {
  color: #ffffff;
 }
+.bi-error-background {
+  background-color: #ff4949;
+  color: #ffffff;
+}
+.bi-error-background .bi-input {
+  color: #ffffff;
+}
+.bi-error-background .bi-textarea {
+  color: #ffffff;
+}
 .bi-high-light-border {
  border-color: #3685f2;
 }
--- a/dist/demo.js
+++ b/dist/demo.js
@ -13286,14 +13286,14 @@ Demo.SingleSelectCombo = BI.inherit(BI.Widget, {

    _getItemsByTimes: function (items, times) {
        var res = [];
-        for (var i = (times - 1) * 10; items[i] && i < times * 10; i++) {
+        for (var i = (times - 1) * 100; items[i] && i < times * 100; i++) {
            res.push(items[i]);
        }
        return res;
    },

    _hasNextByTimes: function (items, times) {
-        return times * 10 < items.length;
+        return times * 100 < items.length;
    },

    _itemsCreator: function (options, callback) {
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -439,6 +439,15 @@ textarea {
 .bi-high-light .bi-textarea {
  color: #3685f2;
 }
+.bi-error {
+  color: #ff4949;
+}
+.bi-error .bi-input {
+  color: #ff4949;
+}
+.bi-error .bi-textarea {
+  color: #ff4949;
+}
 .bi-high-light-background {
  background-color: #3685f2;
  color: #ffffff;
@ -449,6 +458,16 @@ textarea {
 .bi-high-light-background .bi-textarea {
  color: #ffffff;
 }
+.bi-error-background {
+  background-color: #ff4949;
+  color: #ffffff;
+}
+.bi-error-background .bi-input {
+  color: #ffffff;
+}
+.bi-error-background .bi-textarea {
+  color: #ffffff;
+}
 .bi-high-light-border {
  border-color: #3685f2;
 }
@ -2989,7 +3008,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 }

 .bi-toast {
-  font-size: 14px;
  color: #ffffff;
  max-width: 400px;
  min-width: 150px;
@ -3574,10 +3592,10 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -73161,7 +73161,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73212,7 +73212,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73245,7 +73245,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73394,7 +73394,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73427,7 +73427,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73475,7 +73475,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73508,7 +73508,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
@ -73765,7 +73765,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73794,19 +73794,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -73956,7 +73956,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -73985,19 +73985,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -74060,7 +74060,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -74089,19 +74089,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
@ -91447,7 +91447,7 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -92208,7 +92208,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -94734,7 +94734,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
 }());/**
 * Created by zcf on 2016/9/26.
 */
-BI.IntervalSlider = BI.inherit(BI.Widget, {
+BI.IntervalSlider = BI.inherit(BI.Single, {
    _constant: {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
@ -97767,7 +97767,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -98151,7 +98151,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -98518,7 +98518,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -101566,10 +101566,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {

    constants: {
        offset: {
-            top: 1,
-            left: 1,
-            right: 2,
-            bottom: 33
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 31
        }
    },

@ -106479,14 +106479,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
@ -106757,14 +106749,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
@ -110240,7 +110224,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Year"),
                        ref: function () {
@ -110991,7 +110975,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Month"),
                        ref: function () {
@ -111966,7 +111950,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Quarter"),
                        ref: function () {
@ -112230,7 +112214,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
        });
        editor.on(BI.SignEditor.EVENT_CHANGE, function () {
            if(isYear) {
-                self._autoSwitch(editor.getValue());
+                self._autoSwitch(editor);
            }
        });

@ -112263,6 +112247,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
        if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
            if (v.length === 4 && this._yearCheck(v)) {
                this._doEditorConfirm(editor);
+                this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
                this.quarterEditor.focus();
            }
        }
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/images/1x/icon/dark_tree_collapse_1.png
+++ b/dist/images/1x/icon/dark_tree_collapse_1.png
--- a/dist/images/1x/icon/dark_tree_collapse_2.png
+++ b/dist/images/1x/icon/dark_tree_collapse_2.png
--- a/dist/images/1x/icon/dark_tree_collapse_3.png
+++ b/dist/images/1x/icon/dark_tree_collapse_3.png
--- a/dist/images/1x/icon/dark_tree_collapse_4.png
+++ b/dist/images/1x/icon/dark_tree_collapse_4.png
--- a/dist/images/1x/icon/dark_tree_expand_1.png
+++ b/dist/images/1x/icon/dark_tree_expand_1.png
--- a/dist/images/1x/icon/dark_tree_expand_2.png
+++ b/dist/images/1x/icon/dark_tree_expand_2.png
--- a/dist/images/1x/icon/dark_tree_expand_3.png
+++ b/dist/images/1x/icon/dark_tree_expand_3.png
--- a/dist/images/1x/icon/dark_tree_expand_4.png
+++ b/dist/images/1x/icon/dark_tree_expand_4.png
--- a/dist/images/1x/icon/dark_tree_vertical_line_1.png
+++ b/dist/images/1x/icon/dark_tree_vertical_line_1.png
--- a/dist/images/1x/icon/dark_tree_vertical_line_2.png
+++ b/dist/images/1x/icon/dark_tree_vertical_line_2.png
--- a/dist/images/1x/icon/dark_tree_vertical_line_3.png
+++ b/dist/images/1x/icon/dark_tree_vertical_line_3.png
--- a/dist/images/1x/icon/dark_tree_vertical_line_4.png
+++ b/dist/images/1x/icon/dark_tree_vertical_line_4.png
--- a/dist/images/1x/icon/dark_tree_vertical_line_5.png
+++ b/dist/images/1x/icon/dark_tree_vertical_line_5.png
--- a/dist/images/1x/icon/tree_collapse_1.png
+++ b/dist/images/1x/icon/tree_collapse_1.png
--- a/dist/images/1x/icon/tree_collapse_2.png
+++ b/dist/images/1x/icon/tree_collapse_2.png
--- a/dist/images/1x/icon/tree_collapse_3.png
+++ b/dist/images/1x/icon/tree_collapse_3.png
--- a/dist/images/1x/icon/tree_collapse_4.png
+++ b/dist/images/1x/icon/tree_collapse_4.png
--- a/dist/images/1x/icon/tree_expand_1.png
+++ b/dist/images/1x/icon/tree_expand_1.png
--- a/dist/images/1x/icon/tree_expand_2.png
+++ b/dist/images/1x/icon/tree_expand_2.png
--- a/dist/images/1x/icon/tree_expand_3.png
+++ b/dist/images/1x/icon/tree_expand_3.png
--- a/dist/images/1x/icon/tree_expand_4.png
+++ b/dist/images/1x/icon/tree_expand_4.png
--- a/dist/images/1x/icon/tree_vertical_line_1.png
+++ b/dist/images/1x/icon/tree_vertical_line_1.png
--- a/dist/images/1x/icon/tree_vertical_line_2.png
+++ b/dist/images/1x/icon/tree_vertical_line_2.png
--- a/dist/images/1x/icon/tree_vertical_line_3.png
+++ b/dist/images/1x/icon/tree_vertical_line_3.png
--- a/dist/images/1x/icon/tree_vertical_line_4.png
+++ b/dist/images/1x/icon/tree_vertical_line_4.png
--- a/dist/images/1x/icon/tree_vertical_line_5.png
+++ b/dist/images/1x/icon/tree_vertical_line_5.png
--- a/dist/images/2x/icon/dark_tree_collapse_1.png
+++ b/dist/images/2x/icon/dark_tree_collapse_1.png
--- a/dist/images/2x/icon/dark_tree_collapse_2.png
+++ b/dist/images/2x/icon/dark_tree_collapse_2.png
--- a/dist/images/2x/icon/dark_tree_collapse_3.png
+++ b/dist/images/2x/icon/dark_tree_collapse_3.png
--- a/dist/images/2x/icon/dark_tree_collapse_4.png
+++ b/dist/images/2x/icon/dark_tree_collapse_4.png
--- a/dist/images/2x/icon/dark_tree_expand_1.png
+++ b/dist/images/2x/icon/dark_tree_expand_1.png
--- a/dist/images/2x/icon/dark_tree_expand_2.png
+++ b/dist/images/2x/icon/dark_tree_expand_2.png
--- a/dist/images/2x/icon/dark_tree_expand_3.png
+++ b/dist/images/2x/icon/dark_tree_expand_3.png
--- a/dist/images/2x/icon/dark_tree_expand_4.png
+++ b/dist/images/2x/icon/dark_tree_expand_4.png
--- a/dist/images/2x/icon/dark_tree_vertical_line_1.png
+++ b/dist/images/2x/icon/dark_tree_vertical_line_1.png
--- a/dist/images/2x/icon/dark_tree_vertical_line_2.png
+++ b/dist/images/2x/icon/dark_tree_vertical_line_2.png
--- a/dist/images/2x/icon/dark_tree_vertical_line_3.png
+++ b/dist/images/2x/icon/dark_tree_vertical_line_3.png
--- a/dist/images/2x/icon/dark_tree_vertical_line_4.png
+++ b/dist/images/2x/icon/dark_tree_vertical_line_4.png
--- a/dist/images/2x/icon/dark_tree_vertical_line_5.png
+++ b/dist/images/2x/icon/dark_tree_vertical_line_5.png
--- a/dist/images/2x/icon/tree_collapse_1.png
+++ b/dist/images/2x/icon/tree_collapse_1.png
--- a/dist/images/2x/icon/tree_collapse_2.png
+++ b/dist/images/2x/icon/tree_collapse_2.png
--- a/dist/images/2x/icon/tree_collapse_3.png
+++ b/dist/images/2x/icon/tree_collapse_3.png
--- a/dist/images/2x/icon/tree_collapse_4.png
+++ b/dist/images/2x/icon/tree_collapse_4.png
--- a/dist/images/2x/icon/tree_expand_1.png
+++ b/dist/images/2x/icon/tree_expand_1.png
--- a/dist/images/2x/icon/tree_expand_2.png
+++ b/dist/images/2x/icon/tree_expand_2.png
--- a/dist/images/2x/icon/tree_expand_3.png
+++ b/dist/images/2x/icon/tree_expand_3.png
--- a/dist/images/2x/icon/tree_expand_4.png
+++ b/dist/images/2x/icon/tree_expand_4.png
--- a/dist/images/2x/icon/tree_vertical_line_1.png
+++ b/dist/images/2x/icon/tree_vertical_line_1.png
--- a/dist/images/2x/icon/tree_vertical_line_2.png
+++ b/dist/images/2x/icon/tree_vertical_line_2.png
--- a/dist/images/2x/icon/tree_vertical_line_3.png
+++ b/dist/images/2x/icon/tree_vertical_line_3.png
--- a/dist/images/2x/icon/tree_vertical_line_4.png
+++ b/dist/images/2x/icon/tree_vertical_line_4.png
--- a/dist/images/2x/icon/tree_vertical_line_5.png
+++ b/dist/images/2x/icon/tree_vertical_line_5.png
--- a/dist/widget.js
+++ b/dist/widget.js
@ -3580,7 +3580,7 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -4341,7 +4341,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
@ -6867,7 +6867,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
 }());/**
 * Created by zcf on 2016/9/26.
 */
-BI.IntervalSlider = BI.inherit(BI.Widget, {
+BI.IntervalSlider = BI.inherit(BI.Single, {
    _constant: {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
@ -9900,7 +9900,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -10284,7 +10284,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -10651,7 +10651,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
@ -13699,10 +13699,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {

    constants: {
        offset: {
-            top: 1,
-            left: 1,
-            right: 2,
-            bottom: 33
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 31
        }
    },

@ -18612,14 +18612,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
@ -18890,14 +18882,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
@ -22373,7 +22357,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Year"),
                        ref: function () {
@ -23124,7 +23108,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Month"),
                        ref: function () {
@ -24099,7 +24083,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Quarter"),
                        ref: function () {
@ -24363,7 +24347,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
        });
        editor.on(BI.SignEditor.EVENT_CHANGE, function () {
            if(isYear) {
-                self._autoSwitch(editor.getValue());
+                self._autoSwitch(editor);
            }
        });

@ -24396,6 +24380,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
        if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
            if (v.length === 4 && this._yearCheck(v)) {
                this._doEditorConfirm(editor);
+                this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
                this.quarterEditor.focus();
            }
        }
--- a/src/case/button/node/node.arrow.js
+++ b/src/case/button/node/node.arrow.js
@ -45,7 +45,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
--- a/src/case/button/node/node.first.plus.js
+++ b/src/case/button/node/node.first.plus.js
@ -15,7 +15,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -48,7 +48,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
--- a/src/case/button/node/node.last.plus.js
+++ b/src/case/button/node/node.last.plus.js
@ -15,7 +15,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -48,7 +48,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
--- a/src/case/button/node/node.mid.plus.js
+++ b/src/case/button/node/node.mid.plus.js
@ -15,7 +15,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
            id: "",
            pId: "",
            open: false,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -48,7 +48,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 25,
+            width: 24,
            el: this.checkbox
        }, this.text);
        BI.createWidget(BI.extend({
--- a/src/case/button/treeitem/item.first.treeleaf.js
+++ b/src/case/button/treeitem/item.first.treeleaf.js
@ -13,7 +13,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -42,19 +42,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
--- a/src/case/button/treeitem/item.last.treeleaf.js
+++ b/src/case/button/treeitem/item.last.treeleaf.js
@ -13,7 +13,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -42,19 +42,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
--- a/src/case/button/treeitem/item.mid.treeleaf.js
+++ b/src/case/button/treeitem/item.mid.treeleaf.js
@ -13,7 +13,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
            id: "",
            pId: "",
            layer: 0,
-            height: 25
+            height: 24
        });
    },
    _init: function () {
@ -42,19 +42,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
        });
        var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
        var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 13,
+            width: 12,
            el: {
                type: "bi.layout",
                cls: "base-line-conn-background",
-                width: 13,
+                width: 12,
                height: o.height
            }
        }), {
-            width: 25,
+            width: 24,
            el: {
                type: "bi.layout",
                cls: "mid-line-conn-background",
-                width: 25,
+                width: 24,
                height: o.height
            }
        }, {
--- a/src/css/base/single/tip/tip.css
+++ b/src/css/base/single/tip/tip.css
@ -25,7 +25,6 @@
 }

 .bi-toast {
-  font-size: 14px;
  color: #ffffff;
  max-width: 400px;
  min-width: 150px;
--- a/src/css/base/trigger/trigger.css
+++ b/src/css/base/trigger/trigger.css
@ -9,10 +9,10 @@
 .bi-trigger .trigger-down {
  display: block;
 }
-.bi-combo-popup .trigger-up {
+.bi-combo-popup > .bi-trigger .trigger-up {
  display: block;
 }
-.bi-combo-popup .trigger-down {
+.bi-combo-popup > .bi-trigger .trigger-down {
  display: none;
 }

--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -161,6 +161,15 @@ textarea {
 .bi-high-light .bi-textarea {
  color: #3685f2;
 }
+.bi-error {
+  color: #ff4949;
+}
+.bi-error .bi-input {
+  color: #ff4949;
+}
+.bi-error .bi-textarea {
+  color: #ff4949;
+}
 .bi-high-light-background {
  background-color: #3685f2;
  color: #ffffff;
@ -171,6 +180,16 @@ textarea {
 .bi-high-light-background .bi-textarea {
  color: #ffffff;
 }
+.bi-error-background {
+  background-color: #ff4949;
+  color: #ffffff;
+}
+.bi-error-background .bi-input {
+  color: #ffffff;
+}
+.bi-error-background .bi-textarea {
+  color: #ffffff;
+}
 .bi-high-light-border {
  border-color: #3685f2;
 }
--- a/src/less/base/single/tip/tip.toast.less
+++ b/src/less/base/single/tip/tip.toast.less
@ -1,7 +1,6 @@
@import "../../../index";

 .bi-toast{
-  font-size: @font-size-14;
  color: @color-bi-text;
  max-width: 400px;
  min-width: 150px;
--- a/src/less/base/trigger/trigger.less
+++ b/src/less/base/trigger/trigger.less
@ -13,10 +13,12 @@
 }

 .bi-combo-popup {
-  & .trigger-up {
-    display: block;
-  }
-  & .trigger-down {
-    display: none;
+  & > .bi-trigger {
+    .trigger-up {
+      display: block;
+    }
+    .trigger-down {
+      display: none;
+    }
  }
 }
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -205,6 +205,16 @@ textarea {
  }
 }

+.bi-error {
+  color: @color-bi-text-failure;
+  & .bi-input {
+    color: @color-bi-text-failure;
+  }
+  & .bi-textarea {
+    color: @color-bi-text-failure;
+  }
+}
+
 .bi-high-light-background {
  background-color: @color-bi-background-highlight;
  color: @color-bi-text;
@ -216,6 +226,18 @@ textarea {
  }
 }

+.bi-error-background {
+  background-color: @color-bi-background-failure;
+  color: @color-bi-text;
+  & .bi-input {
+    color: @color-bi-text;
+  }
+  & .bi-textarea {
+    color: @color-bi-text;
+  }
+}
+
+
 .bi-high-light-border {
  border-color: @color-bi-border-highlight;
 }
--- a/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/src/widget/dynamicdate/dynamicdate.popup.js
@ -36,7 +36,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
--- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@ -36,7 +36,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Multi_Date_Today"),
                        ref: function () {
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@ -1,7 +1,7 @@
 /**
 * Created by zcf on 2016/9/26.
 */
-BI.IntervalSlider = BI.inherit(BI.Widget, {
+BI.IntervalSlider = BI.inherit(BI.Single, {
    _constant: {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@ -39,7 +39,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@ -36,7 +36,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@ -39,7 +39,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                offset: {
                    left: 1,
                    top: 1,
-                    right: 2,
+                    right: 1,
                    bottom: 33
                }
            },
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@ -8,10 +8,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {

    constants: {
        offset: {
-            top: 1,
-            left: 1,
-            right: 2,
-            bottom: 33
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 31
        }
    },

--- a/src/widget/singleselect/singleselect.combo.js
+++ b/src/widget/singleselect/singleselect.combo.js
@ -30,14 +30,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
--- a/src/widget/singleselect/singleselect.insert.combo.js
+++ b/src/widget/singleselect/singleselect.insert.combo.js
@ -30,14 +30,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
            type: "bi.single_select_trigger",
            height: o.height,
            // adapter: this.popup,
-            masker: {
-                offset: {
-                    left: 1,
-                    top: 1,
-                    right: 2,
-                    bottom: 33
-                }
-            },
            valueFormatter: o.valueFormatter,
            itemsCreator: function (op, callback) {
                o.itemsCreator(op, function (res) {
--- a/src/widget/year/popup.year.js
+++ b/src/widget/year/popup.year.js
@ -44,7 +44,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Year"),
                        ref: function () {
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@ -44,7 +44,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Month"),
                        ref: function () {
--- a/src/widget/yearquarter/popup.yearquarter.js
+++ b/src/widget/yearquarter/popup.yearquarter.js
@ -37,7 +37,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                    }, {
                        type: "bi.text_button",
                        forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
                        shadow: true,
                        text: BI.i18nText("BI-Basic_Current_Quarter"),
                        ref: function () {
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@ -103,7 +103,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
        });
        editor.on(BI.SignEditor.EVENT_CHANGE, function () {
            if(isYear) {
-                self._autoSwitch(editor.getValue());
+                self._autoSwitch(editor);
            }
        });

@ -136,6 +136,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
        if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
            if (v.length === 4 && this._yearCheck(v)) {
                this._doEditorConfirm(editor);
+                this.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
                this.quarterEditor.focus();
            }
        }