diff --git a/dist/bundle.css b/dist/bundle.css
index 4e7332708a..73ed85675f 100644
--- a/dist/bundle.css
+++ b/dist/bundle.css
@@ -6039,24 +6039,24 @@ textarea::-webkit-scrollbar-thumb:hover {
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .trigger-triangle-font .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:hover .b-font:before,
 .trigger-triangle-font.hover .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:active .b-font:before,
 .trigger-triangle-font.active .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #3685f2;
 }
 .trigger-triangle-font.disabled .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .pull-down-font .b-font {
@@ -6167,45 +6167,45 @@ textarea::-webkit-scrollbar-thumb:hover {
   color: #faaa39;
 }
 .less-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: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:hover .b-font:before,
 .less-font.hover .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:active .b-font:before,
 .less-font.active .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: #3f8ce8;
 }
 .less-font.disabled .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-equal-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .less-equal-font .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:hover .b-font:before,
 .less-equal-font.hover .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:active .b-font:before,
 .less-equal-font.active .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: #3f8ce8;
 }
 .less-equal-font.disabled .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .text-bold-font .b-font {
diff --git a/dist/bundle.js b/dist/bundle.js
index bdf977b341..8bf419e1e7 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -77737,8 +77737,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             adjustXOffset: 0,
             adjustYOffset: 0,
             offsetStyle: "left",
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            isShowDown: true
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
         });
     },
 
@@ -77754,8 +77753,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             height: o.height,
             iconWidth: o.iconWidth,
             iconHeight: o.iconHeight,
-            value: o.value,
-            isShowDown: o.isShowDown
+            value: o.value
         });
         this.popup = BI.createWidget(o.popup, {
             type: "bi.icon_combo_popup",
@@ -77921,7 +77919,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
             disableSelected: true,
             cls: "icon-combo-down-icon trigger-triangle-font",
             width: 12,
-            height: o.height,
+            height: 8,
             selected: BI.isNotEmptyString(iconCls)
         });
         this.down.setVisible(o.isShowDown);
@@ -90933,7 +90931,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
                     break;
                 case this._const.yearMonthLength:
                 case this._const.yearFullMonthLength:
-                    if (this._monthCheck(v)) {
+                    var splitMonth = v.split("-")[1];
+                    if ((BI.isNotNull(splitMonth) && splitMonth.length === 2) || this._monthCheck(v)) {
                         this.editor.setValue(v + "-");
                     }
                     break;
@@ -91872,7 +91871,9 @@ BI.extend(BI.DynamicDateTimeSelect, {
                     }
                     break;
                 case this._const.yearMonthLength:
-                    if (this._monthCheck(v)) {
+                case this._const.yearFullMonthLength:
+                    var splitMonth = v.split("-")[1];
+                    if ((BI.isNotNull(splitMonth) && splitMonth.length === 2) || this._monthCheck(v)) {
                         this.editor.setValue(v + "-");
                     }
                     break;
@@ -100596,7 +100597,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             type: "bi.icon_combo",
             cls: "number-interval-small-combo bi-border",
             height: o.height - 2,
-            isShowDown: false,
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -100615,7 +100615,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-big-combo bi-border",
-            isShowDown: false,
             height: o.height - 2,
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
@@ -103650,19 +103649,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
+                            self._defaultState();
                         });
                     }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self._defaultState();
-                    }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        self.setValue();
-                        self._defaultState();
-                    }
                 }],
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
@@ -104200,13 +104189,12 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
         });
 
         this.popupView = BI.createWidget({
-            type: "bi.multi_popup_view",
+            type: "bi.popup_view",
             stopPropagation: false,
             maxWidth: opts.maxWidth,
             minWidth: opts.minWidth,
             maxHeight: opts.maxHeight,
             element: this,
-            buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")],
             el: this.loader,
             value: opts.value
         });
@@ -104214,16 +104202,6 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
         this.popupView.on(BI.MultiPopupView.EVENT_CHANGE, function () {
             self.fireEvent(BI.SingleSelectPopupView.EVENT_CHANGE);
         });
-        this.popupView.on(BI.MultiPopupView.EVENT_CLICK_TOOLBAR_BUTTON, function (index) {
-            switch (index) {
-                case 0:
-                    self.fireEvent(BI.SingleSelectPopupView.EVENT_CLICK_CLEAR);
-                    break;
-                case 1:
-                    self.fireEvent(BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM);
-                    break;
-            }
-        });
     },
 
     setStartValue: function (v) {
@@ -104252,8 +104230,6 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
 });
 
 BI.SingleSelectPopupView.EVENT_CHANGE = "EVENT_CHANGE";
-BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
-BI.SingleSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
 
 
 BI.shortcut("bi.single_select_popup_view", BI.SingleSelectPopupView);/**
@@ -105184,13 +105160,13 @@ BI.SingleSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
 
 BI.shortcut("bi.single_select_search_add_pane", BI.SingleSelectSearchPane);/**
  *
- * @class BI.SingleSelectCombo
+ * @class BI.SingleSelectInsertCombo
  * @extends BI.Single
  */
-BI.SingleSelectCombo = BI.inherit(BI.Single, {
+BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
-        return BI.extend(BI.SingleSelectCombo.superclass._defaultConfig.apply(this, arguments), {
+        return BI.extend(BI.SingleSelectInsertCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
@@ -105199,7 +105175,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     },
 
     _init: function () {
-        BI.SingleSelectCombo.superclass._init.apply(this, arguments);
+        BI.SingleSelectInsertCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
 
         var assertShowValue = function () {
@@ -105301,19 +105277,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
+                            self._defaultState();
                         });
                     }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self._defaultState();
-                    }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        self.setValue();
-                        self._defaultState();
-                    }
                 }],
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
@@ -105344,7 +105310,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
+                self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
             }
         });
 
@@ -105397,7 +105363,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         this._assertValue(this.storeValue);
         this.requesting = true;
         o.itemsCreator({
-            type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
+            type: BI.SingleSelectInsertCombo.REQ_GET_ALL_DATA,
             keywords: keywords
         }, function (ob) {
             var values = BI.map(ob.items, "value");
@@ -105420,7 +105386,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         this._assertValue(res);
         this.requesting = true;
         o.itemsCreator({
-            type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
+            type: BI.SingleSelectInsertCombo.REQ_GET_ALL_DATA,
             keywords: [this.trigger.getKey()]
         }, function (ob) {
             var items = BI.map(ob.items, "value");
@@ -105457,7 +105423,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         if (!this._count) {
             o.itemsCreator({
-                type: BI.SingleSelectCombo.REQ_GET_DATA_LENGTH
+                type: BI.SingleSelectInsertCombo.REQ_GET_DATA_LENGTH
             }, function (res) {
                 self._count = res.count;
                 adjust();
@@ -105471,7 +105437,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         function adjust () {
             if (self.wants2Quit === true) {
-                self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
+                self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
             }
             self.requesting = false;
@@ -105525,14 +105491,14 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     }
 });
 
-BI.extend(BI.SingleSelectCombo, {
+BI.extend(BI.SingleSelectInsertCombo, {
     REQ_GET_DATA_LENGTH: 0,
     REQ_GET_ALL_DATA: -1
 });
 
-BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
+BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 
-BI.shortcut("bi.single_select_add_combo", BI.SingleSelectCombo);/**
+BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);/**
  *
  * 单选下拉框
  * @class BI.SingleSelectTrigger
@@ -108203,8 +108169,8 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
             vgap: c.vgap,
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             allowBlank: true,
-            errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
+            errorText: function () {
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             }
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
@@ -108491,9 +108457,9 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
         obj = obj || {};
         obj.year = obj.year || 0;
         obj.month = obj.month || 0;
-        if (BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
+        if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
             var year = BI.getDate().getFullYear();
-            this.selectedYear = "";
+            this.selectedYear = year;
             this.selectedMonth = "";
             this.yearPicker.setValue(year);
             this.month.setValue();
@@ -108527,6 +108493,9 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);BI.DynamicYearM
             max: o.max,
             value: o.value || ""
         });
+        this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN, function () {
+            self.combo.isViewVisible() && self.combo.hideView();
+        });
         this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });
@@ -108838,7 +108807,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     switch (v) {
                         case BI.DynamicYearCombo.Static:
                             var date = BI.DynamicDateHelper.getCalculation(self.dynamicPane.getValue());
-                            self.year.setValue({year: date.getFullYear(), month: date.getMonth()});
+                            self.year.setValue({year: date.getFullYear(), month: date.getMonth() + 1});
                             self._setInnerValue();
                             break;
                         case BI.DynamicYearCombo.Dynamic:
@@ -108964,12 +108933,15 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
             },
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") :  BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             },
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true
         });
+        editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
+            self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN);
+        });
         editor.on(BI.SignEditor.EVENT_FOCUS, function () {
             self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_FOCUS);
         });
@@ -108981,16 +108953,14 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
             if (BI.isNotNull(value)) {
                 editor.setValue(value);
             }
-            if (BI.isNotEmptyString(value)) {
-                var monthValue = self.monthEditor.getValue();
-                self.storeValue = {
-                    type: BI.DynamicDateCombo.Static,
-                    value: {
-                        year: self.yearEditor.getValue(),
-                        month: BI.isEmptyString(self.monthEditor.getValue()) ? "" : monthValue
-                    }
-                };
-            }
+            var monthValue = self.monthEditor.getValue();
+            self.storeValue = {
+                type: BI.DynamicDateCombo.Static,
+                value: {
+                    year: self.yearEditor.getValue(),
+                    month: BI.isEmptyString(self.monthEditor.getValue()) ? "" : monthValue
+                }
+            };
             self.setTitle(self._getStaticTitle(self.storeValue.value));
 
             self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);
@@ -109057,8 +109027,8 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
 
     _getStaticTitle: function (value) {
         value = value || {};
-        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year + "-";
-        var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : value.month;
+        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
+        var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
         return yearStr + monthStr;
     },
 
@@ -109107,6 +109077,7 @@ BI.DynamicYearMonthTrigger.EVENT_ERROR = "EVENT_ERROR";
 BI.DynamicYearMonthTrigger.EVENT_START = "EVENT_START";
 BI.DynamicYearMonthTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
+BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
 BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
     constants: {
         height: 26,
@@ -109461,9 +109432,9 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
         obj = obj || {};
         obj.year = obj.year || 0;
         obj.quarter = obj.quarter || 0;
-        if (BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
+        if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
             var year = BI.getDate().getFullYear();
-            this.selectedYear = "";
+            this.selectedYear = year;
             this.selectedQuarter = "";
             this.yearPicker.setValue(year);
             this.quarter.setValue();
@@ -109497,6 +109468,9 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);BI.DynamicY
             max: o.max,
             value: o.value || ""
         });
+        this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN, function () {
+            self.combo.isViewVisible() && self.combo.hideView();
+        });
         this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });
@@ -109907,13 +109881,16 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
                 return false;
             },
             errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             },
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true
         });
+        editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
+            self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN);
+        });
         editor.on(BI.SignEditor.EVENT_FOCUS, function () {
             self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_FOCUS);
         });
@@ -109925,16 +109902,14 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
             if (BI.isNotNull(value)) {
                 editor.setValue(value);
             }
-            if (BI.isNotEmptyString(value)) {
-                var quarterValue = self.quarterEditor.getValue();
-                self.storeValue = {
-                    type: BI.DynamicYearQuarterCombo.Static,
-                    value: {
-                        year: self.yearEditor.getValue(),
-                        quarter: BI.isEmptyString(self.quarterEditor.getValue()) ? "" : quarterValue
-                    }
-                };
-            }
+            var quarterValue = self.quarterEditor.getValue();
+            self.storeValue = {
+                type: BI.DynamicYearQuarterCombo.Static,
+                value: {
+                    year: self.yearEditor.getValue(),
+                    quarter: BI.isEmptyString(self.quarterEditor.getValue()) ? "" : quarterValue
+                }
+            };
             self.setTitle(self._getStaticTitle(self.storeValue.value));
 
             self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
@@ -109974,8 +109949,8 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
 
     _getStaticTitle: function (value) {
         value = value || {};
-        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year + "-";
-        var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : value.quarter;
+        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
+        var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
         return yearStr + quarterStr;
     },
 
@@ -110033,6 +110008,7 @@ BI.DynamicYearQuarterTrigger.EVENT_ERROR = "EVENT_ERROR";
 BI.DynamicYearQuarterTrigger.EVENT_START = "EVENT_START";
 BI.DynamicYearQuarterTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearQuarterTrigger.EVENT_STOP = "EVENT_STOP";
+BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
 BI.shortcut("bi.dynamic_year_quarter_trigger", BI.DynamicYearQuarterTrigger);/**
  * 简单的复选下拉框控件, 适用于数据量少的情况， 与valuechooser的区别是allvaluechooser setValue和getValue返回的是所有值
  * 封装了字段处理逻辑
diff --git a/dist/case.js b/dist/case.js
index 151ff6fcb5..ee105c13ac 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -5288,8 +5288,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             adjustXOffset: 0,
             adjustYOffset: 0,
             offsetStyle: "left",
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            isShowDown: true
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
         });
     },
 
@@ -5305,8 +5304,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             height: o.height,
             iconWidth: o.iconWidth,
             iconHeight: o.iconHeight,
-            value: o.value,
-            isShowDown: o.isShowDown
+            value: o.value
         });
         this.popup = BI.createWidget(o.popup, {
             type: "bi.icon_combo_popup",
@@ -5472,7 +5470,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
             disableSelected: true,
             cls: "icon-combo-down-icon trigger-triangle-font",
             width: 12,
-            height: o.height,
+            height: 8,
             selected: BI.isNotEmptyString(iconCls)
         });
         this.down.setVisible(o.isShowDown);
diff --git a/dist/fineui.css b/dist/fineui.css
index a8fec71565..803e44c43b 100644
--- a/dist/fineui.css
+++ b/dist/fineui.css
@@ -6039,24 +6039,24 @@ textarea::-webkit-scrollbar-thumb:hover {
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .trigger-triangle-font .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:hover .b-font:before,
 .trigger-triangle-font.hover .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:active .b-font:before,
 .trigger-triangle-font.active .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #3685f2;
 }
 .trigger-triangle-font.disabled .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .pull-down-font .b-font {
@@ -6167,45 +6167,45 @@ textarea::-webkit-scrollbar-thumb:hover {
   color: #faaa39;
 }
 .less-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: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:hover .b-font:before,
 .less-font.hover .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:active .b-font:before,
 .less-font.active .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: #3f8ce8;
 }
 .less-font.disabled .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-equal-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }
 .less-equal-font .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:hover .b-font:before,
 .less-equal-font.hover .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:active .b-font:before,
 .less-equal-font.active .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: #3f8ce8;
 }
 .less-equal-font.disabled .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .text-bold-font .b-font {
diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index 4b831c55d9..94a8128aa8 100644
Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
index cde692e9a3..438e4ab5c2 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -522,7 +522,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="normal93" unicode="&#59190;" d="M698.624 364.8H248.96C217.6 364.8 192 382.016 192 403.2c0 21.184 25.536 38.4 56.96 38.4h454.592L495.744 649.344a32 32 0 0 0 45.312 45.312l263.872-263.936a31.936 31.936 0 0 0 9.28-25.088 31.936 31.936 0 0 0-9.28-25.088l-263.872-263.872a32 32 0 0 0-45.312 45.248l202.88 202.88z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="tianjiayewubao" unicode="&#59191;" d="M490.666667 341.333333h-106.666667a21.333333 21.333333 0 0 1 0-42.666666h106.666667v-106.666667a21.333333 21.333333 0 0 1 42.666666 0v106.666667h106.666667a21.333333 21.333333 0 0 1 0 42.666666h-106.666667v106.666667a21.333333 21.333333 0 0 1-42.666666 0v-106.666667zM213.333333 0a106.666667 106.666667 0 0 0-106.666666 106.666667V661.333333a106.666667 106.666667 0 0 0 106.666666 106.666667h188.544a85.333333 85.333333 0 0 0 64.042667-28.949333l61.696-70.101334A85.333333 85.333333 0 0 1 591.68 640H810.666667a106.666667 106.666667 0 0 0 106.666666-106.666667v-426.666666a106.666667 106.666667 0 0 0-106.666666-106.666667H213.333333z"  horiz-adv-x="1024" />
+    <glyph glyph-name="tianjiayewubao" unicode="&#59191;" d="M490.666667 341.33333300000004h-106.666667a21.333333 21.333333 0 0 1 0-42.666666h106.666667v-106.666667a21.333333 21.333333 0 0 1 42.666666 0v106.666667h106.666667a21.333333 21.333333 0 0 1 0 42.666666h-106.666667v106.666667a21.333333 21.333333 0 0 1-42.666666 0v-106.666667zM213.333333-21.33333300000004a106.666667 106.666667 0 0 0-106.666666 106.666666V682.666667a106.666667 106.666667 0 0 0 106.666666 106.666666h193.109334a85.333333 85.333333 0 0 0 58.666666-23.36l63.317334-59.946666A85.333333 85.333333 0 0 1 587.093333 682.666667H810.666667a106.666667 106.666667 0 0 0 106.666666-106.666667v-490.666667a106.666667 106.666667 0 0 0-106.666666-106.666666H213.333333z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="FineDirect" unicode="&#59192;" d="M543.850667 490.453333L440.32 580.48a53.333333 53.333333 0 1 1-80-13.248l-80.768-83.626667a42.666667 42.666667 0 1 1 14.293333-15.893333l86.016 89.045333a53.354667 53.354667 0 0 1 45.994667 8.021334l108.714667-94.506667a53.333333 53.333333 0 1 1 94.357333 20.928l88.448 113.216a64 64 0 1 1-17.066667 12.8l-87.530666-112.021333a53.248 53.248 0 0 1-68.949334-14.698667zM896 239.957333A201.749333 201.749333 0 0 1 778.666667 277.333333a202.666667 202.666667 0 0 1-202.666667-202.666666c0-41.6 12.522667-80.234667 34.005333-112.405334l-374.250666-3.84a106.666667 106.666667 0 0 0-107.754667 106.666667V704a106.666667 106.666667 0 0 0 106.666667 106.666667h554.666666a106.666667 106.666667 0 0 0 106.666667-106.666667v-464.064zM234.666667 341.333333a21.333333 21.333333 0 0 1 0-42.666666h469.333333a21.333333 21.333333 0 0 1 0 42.666666H234.666667z m0-106.666666a21.333333 21.333333 0 0 1 0-42.666667h298.666666a21.333333 21.333333 0 0 1 0 42.666667H234.666667z m0-106.666667a21.333333 21.333333 0 0 1 0-42.666667h298.666666a21.333333 21.333333 0 0 1 0 42.666667H234.666667zM691.904-23.381333c20.586667-18.218667 46.933333-30.058667 75.946667-32.426667l10.816 43.2 10.794666-43.2A130.922667 130.922667 0 1 1 693.973333 174.506667l22.656-37.781334-37.76 22.656a130.346667 130.346667 0 0 1-30.677333-73.898666l43.2-10.794667-43.2-10.794667a130.282667 130.282667 0 0 1 27.797333-70.421333l40.64 24.384-24.725333-41.216zM778.666667-85.333333a160 160 0 1 0 0 320 160 160 0 0 0 0-320zM778.666667 191.04a116.373333 116.373333 0 0 0 82.282666-198.656L778.666667 74.666667v116.373333z"  horiz-adv-x="1024" />
@@ -531,7 +531,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="FineIndex" unicode="&#59193;" d="M896 238.186667l-72.810667 46.08a42.666667 42.666667 0 0 1-45.568 0.042666l-160.362666-101.098666A42.666667 42.666667 0 0 1 597.333333 147.114667v-148.117334a42.666667 42.666667 0 0 1 20.821334-36.650666l-382.4-3.904a106.666667 106.666667 0 0 0-107.754667 106.666666V704a106.666667 106.666667 0 0 0 106.666667 106.666667h554.666666a106.666667 106.666667 0 0 0 106.666667-106.666667v-465.813333zM543.850667 490.453333l-103.509334 89.984a53.333333 53.333333 0 1 1-80-13.248l-80.768-83.626666a42.666667 42.666667 0 1 1 14.293334-15.893334l86.016 89.045334a53.354667 53.354667 0 0 1 45.994666 8.021333l108.714667-94.506667a53.333333 53.333333 0 1 1 94.357333 20.928l88.448 113.216a64 64 0 1 1-17.066666 12.8l-87.530667-112.021333a53.248 53.248 0 0 1-68.949333-14.698667zM234.666667 341.333333a21.333333 21.333333 0 0 1 0-42.666666h490.666666a21.333333 21.333333 0 0 1 0 42.666666H234.666667z m0-106.666666a21.333333 21.333333 0 0 1 0-42.666667h298.666666a21.333333 21.333333 0 0 1 0 42.666667H234.666667z m0-106.666667a21.333333 21.333333 0 0 1 0-42.666667h298.666666a21.333333 21.333333 0 0 1 0 42.666667H234.666667z m582.826666 102.784l134.826667-78.848a14.208 14.208 0 0 0 0-24.533333l-134.826667-78.848a28.437333 28.437333 0 0 0-28.672 0L653.653333 127.36a14.208 14.208 0 0 0 0 24.554667l135.168 78.848a28.437333 28.437333 0 0 0 28.672 0z m126.464-203.669333a10.666667 10.666667 0 0 0 10.752-18.410667l-134.826666-78.848a39.082667 39.082667 0 0 0-39.424 0l-135.168 78.848a10.666667 10.666667 0 0 0 10.752 18.410667l135.168-78.848c5.546667-3.242667 12.373333-3.242667 17.92 0l134.826666 78.848z m0 56.853333a10.666667 10.666667 0 1 0 10.752-18.410667l-134.826666-78.848a39.082667 39.082667 0 0 0-39.424 0l-135.168 78.848a10.666667 10.666667 0 0 0 10.752 18.410667l135.168-78.848c5.546667-3.242667 12.373333-3.242667 17.92 0l134.826666 78.848z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="wodefenxibiao" unicode="&#59194;" d="M543.850667 490.453333L440.32 580.48a53.333333 53.333333 0 1 1-80-13.248l-80.768-83.626667a42.666667 42.666667 0 1 1 14.293333-15.893333l86.016 89.045333a53.354667 53.354667 0 0 1 45.994667 8.021334l108.714667-94.506667a53.333333 53.333333 0 1 1 94.357333 20.928l88.448 113.216a64 64 0 1 1-17.066667 12.8l-87.530666-112.021333a53.248 53.248 0 0 1-68.949334-14.698667zM234.666667 810.666667h554.666666a106.666667 106.666667 0 0 0 106.666667-106.666667v-633.216a106.666667 106.666667 0 0 0-105.578667-106.666667l-554.666666-5.674666a106.666667 106.666667 0 0 0-107.754667 106.666666V704a106.666667 106.666667 0 0 0 106.666667 106.666667z m0-469.333334a21.333333 21.333333 0 0 1 0-42.666666h554.666666a21.333333 21.333333 0 0 1 0 42.666666H234.666667z m0-106.666666a21.333333 21.333333 0 0 1 0-42.666667h554.666666a21.333333 21.333333 0 0 1 0 42.666667H234.666667z m0-106.666667a21.333333 21.333333 0 0 1 0-42.666667h554.666666a21.333333 21.333333 0 0 1 0 42.666667H234.666667z"  horiz-adv-x="1024" />
+    <glyph glyph-name="wodefenxibiao" unicode="&#59194;" d="M213.333333 789.333333h426.666667a21.333333 21.333333 0 0 0 21.333333-21.333333v-170.666667a64 64 0 0 1 64-64h170.666667a21.333333 21.333333 0 0 0 21.333333-21.333333v-426.666667a106.666667 106.666667 0 0 0-106.666666-106.666666H213.333333a106.666667 106.666667 0 0 0-106.666666 106.666666V682.666667a106.666667 106.666667 0 0 0 106.666666 106.666666z m527.082667-36.416l140.501333-140.501333A21.333333 21.333333 0 0 0 865.834667 576H768a64 64 0 0 0-64 64V737.834667a21.333333 21.333333 0 0 0 36.416 15.082666zM234.666667 618.666667a21.333333 21.333333 0 1 1 0-42.666667h256a21.333333 21.333333 0 1 1 0 42.666667H234.666667z m0-128a21.333333 21.333333 0 1 1 0-42.666667h384a21.333333 21.333333 0 0 1 0 42.666667H234.666667z m0-128a21.333333 21.333333 0 1 1 0-42.666667h384a21.333333 21.333333 0 0 1 0 42.666667H234.666667z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="normal94" unicode="&#59195;" d="M512 140.8c93.44 0 188.608 39.936 267.456 106.048C842.176 299.392 883.2 361.92 883.2 384c0 22.08-41.088 84.608-103.744 137.152C700.608 587.264 605.44 627.2 512 627.2c-93.44 0-188.608-39.936-267.456-106.048C181.824 468.608 140.8 406.08 140.8 384c0-22.08 41.088-84.608 103.744-137.152C323.392 180.736 418.56 140.8 512 140.8zM512 64c-247.424 0-448 224-448 320s200.576 320 448 320 448-224 448-320-200.576-320-448-320z m0 160a160 160 0 1 1 0 320 160 160 0 0 1 0-320z"  horiz-adv-x="1024" />
@@ -543,7 +543,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="FineIndex1" unicode="&#59197;" d="M917.333333 469.333333v-201.984l-94.144 59.562667a42.666667 42.666667 0 0 1-45.568 0.064l-160.362666-101.098667A42.666667 42.666667 0 0 1 597.333333 189.781333v-148.117333a42.666667 42.666667 0 0 1 25.130667-38.890667l6.144-2.773333H213.333333a106.666667 106.666667 0 0 0-106.666666 106.666667V469.333333h810.666666z m0 42.666667H106.666667v149.333333a106.666667 106.666667 0 0 0 106.666666 106.666667h188.544a85.333333 85.333333 0 0 0 64.042667-28.949333l61.696-70.101334A85.333333 85.333333 0 0 1 591.68 640H810.666667a106.666667 106.666667 0 0 0 106.666666-106.666667v-21.333333z m-704-106.666667a21.333333 21.333333 0 0 1 0-42.666666h213.333334a21.333333 21.333333 0 0 1 0 42.666666H213.333333z m0-106.666666a21.333333 21.333333 0 0 1 0-42.666667h85.333334a21.333333 21.333333 0 0 1 0 42.666667h-85.333334z m604.16-25.216l134.826667-78.848a14.208 14.208 0 0 0 0-24.533334l-134.826667-78.848a28.437333 28.437333 0 0 0-28.672 0L653.653333 170.026667a14.208 14.208 0 0 0 0 24.554666l135.168 78.848a28.437333 28.437333 0 0 0 28.672 0z m126.464-203.669334a10.666667 10.666667 0 0 0 10.752-18.410666l-134.826666-78.848a39.082667 39.082667 0 0 0-39.424 0l-135.168 78.848a10.666667 10.666667 0 0 0 10.752 18.410666l135.168-78.848c5.546667-3.242667 12.373333-3.242667 17.92 0l134.826666 78.848z m0 56.853334a10.666667 10.666667 0 1 0 10.752-18.410667l-134.826666-78.848a39.082667 39.082667 0 0 0-39.424 0l-135.168 78.848a10.666667 10.666667 0 0 0 10.752 18.410667l135.168-78.848c5.546667-3.242667 12.373333-3.242667 17.92 0l134.826666 78.848z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="yewubao" unicode="&#59198;" d="M106.666667 469.333333h810.666666v-362.666666a106.666667 106.666667 0 0 0-106.666666-106.666667H213.333333a106.666667 106.666667 0 0 0-106.666666 106.666667V469.333333z m0 42.666667v149.333333a106.666667 106.666667 0 0 0 106.666666 106.666667h188.544a85.333333 85.333333 0 0 0 64.042667-28.949333l61.696-70.101334A85.333333 85.333333 0 0 1 591.68 640H810.666667a106.666667 106.666667 0 0 0 106.666666-106.666667v-21.333333H106.666667z m106.666666-106.666667a21.333333 21.333333 0 0 1 0-42.666666h213.333334a21.333333 21.333333 0 0 1 0 42.666666H213.333333z m0-106.666666a21.333333 21.333333 0 0 1 0-42.666667h85.333334a21.333333 21.333333 0 0 1 0 42.666667h-85.333334z"  horiz-adv-x="1024" />
+    <glyph glyph-name="yewubao" unicode="&#59198;" d="M106.666667 469.333333h810.666666v-384a106.666667 106.666667 0 0 0-106.666666-106.666666H213.333333a106.666667 106.666667 0 0 0-106.666666 106.666666V469.333333z m0 42.666667v170.666667a106.666667 106.666667 0 0 0 106.666666 106.666666h193.109334a85.333333 85.333333 0 0 0 58.666666-23.36l63.317334-59.946666A85.333333 85.333333 0 0 1 587.093333 682.666667H810.666667a106.666667 106.666667 0 0 0 106.666666-106.666667v-64H106.666667z m106.666666-128a21.333333 21.333333 0 0 1 0-42.666667h256a21.333333 21.333333 0 0 1 0 42.666667H213.333333z m0-128a21.333333 21.333333 0 0 1 0-42.666667h128a21.333333 21.333333 0 0 1 0 42.666667h-128z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="normal95" unicode="&#59199;" d="M611.264 384l-62.4 62.464a38.4 38.4 0 1 0 54.272 54.272l128-128a38.4 38.4 0 0 0 0-54.272l-128-128a38.4 38.4 0 0 0-54.272 54.272L611.2 307.2H320A38.4 38.4 0 1 0 320 384h291.264zM128 800h320l128-128h320a64 64 0 0 0 64-64v-576a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64v704a64 64 0 0 0 64 64z m12.8-76.8v-678.4h742.4V595.2H544.192l-128 128H140.8z"  horiz-adv-x="1024" />
@@ -837,7 +837,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="waiguanpeizhi" unicode="&#59250;" d="M851.136 678.208A102.4 102.4 0 0 0 947.136 576v-128a102.4 102.4 0 0 0-102.4-102.4h-288a25.6 25.6 0 0 1-25.6-25.6v-89.6h25.6a70.4 70.4 0 0 0 70.4-70.4v-192a70.4 70.4 0 0 0-70.4-70.4h-128a70.4 70.4 0 0 0-70.4 70.4v192a70.4 70.4 0 0 0 70.4 70.4h25.6V320a102.4 102.4 0 0 0 102.4 102.4h288a25.6 25.6 0 0 1 25.6 25.6V576a25.6 25.6 0 0 1-19.2 24.768V544a102.4 102.4 0 0 0-102.4-102.4h-512a102.4 102.4 0 0 0-102.4 102.4V576a38.4 38.4 0 1 0 76.8 0v-32c0-14.08 11.456-25.6 25.6-25.6h512a25.6 25.6 0 0 1 25.6 25.6V768a25.6 25.6 0 0 1-25.6 25.6h-512a25.6 25.6 0 0 1-25.6-25.6v-64a38.4 38.4 0 0 0-38.4-38.4H108.8a38.4 38.4 0 1 0 0 76.8h25.536V768a102.4 102.4 0 0 0 102.4 102.4h512a102.4 102.4 0 0 0 102.4-102.4v-89.792zM435.136-25.6h115.2v179.2h-115.2v-179.2z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="quanxianguanli" unicode="&#59251;" d="M691.2 544v64a179.2 179.2 0 1 1-358.4 0v-64H256v64a256 256 0 1 0 512 0v-64h-76.8z m-358.4 0h358.4v64a179.2 179.2 0 1 1-358.4 0v-64zM256 544v64a256 256 0 1 0 512 0v-64h64a64 64 0 0 0 64-64v-320a256 256 0 0 0-256-256H384a256 256 0 0 0-256 256v320a64 64 0 0 0 64 64h64z m-51.2-76.8v-307.2A179.2 179.2 0 0 1 384-19.2h256a179.2 179.2 0 0 1 179.2 179.2V467.2H204.8zM512 96a128 128 0 1 0 0 256 128 128 0 0 0 0-256z m0 76.8a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z"  horiz-adv-x="1024" />
+    <glyph glyph-name="quanxianguanli" unicode="&#59251;" d="M332.8 544h358.4v64a179.2 179.2 0 1 1-358.4 0v-64zM256 544v64a256 256 0 1 0 512 0v-64h64a64 64 0 0 0 64-64v-320a256 256 0 0 0-256-256H384a256 256 0 0 0-256 256v320a64 64 0 0 0 64 64h64z m-51.2-76.8v-307.2A179.2 179.2 0 0 1 384-19.200000000000045h256a179.2 179.2 0 0 1 179.2 179.2V467.2H204.8zM512 96a128 128 0 1 0 0 256 128 128 0 0 0 0-256z m0 76.8a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="xinxitongzhi" unicode="&#59252;" d="M249.6 89.6H160A102.4 102.4 0 0 0 57.6 192V704a102.4 102.4 0 0 0 102.4 102.4h704A102.4 102.4 0 0 0 966.4 704v-512a102.4 102.4 0 0 0-102.4-102.4H556.8l-194.56-145.92A70.4 70.4 0 0 0 249.6 0v89.6z m76.8-76.8l194.56 145.92a38.4 38.4 0 0 0 23.04 7.68h320a25.6 25.6 0 0 1 25.6 25.6V704a25.6 25.6 0 0 1-25.6 25.6h-704a25.6 25.6 0 0 1-25.6-25.6v-512c0-14.08 11.52-25.6 25.6-25.6h128a38.4 38.4 0 0 0 38.4-38.4v-115.2zM192 512l128 0 0-128-128 0 0 128ZM448 512l128 0 0-128-128 0 0 128ZM704 512l128 0 0-128-128 0 0 128Z"  horiz-adv-x="1024" />
@@ -924,6 +924,39 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="biaojiweiyidu" unicode="&#59267;" d="M417.024 236.352a38.272 38.272 0 0 0-9.984-11.072l-256-192a38.4 38.4 0 0 0-10.24-5.504v-14.976h742.4v14.976a38.4 38.4 0 0 0-10.24 5.504l-256 192a38.272 38.272 0 0 0-9.984 11.072c-56.896-39.68-133.056-39.68-189.952 0z m-54.912 51.2L140.8 508.864V121.6l220.16 165.12a39.04 39.04 0 0 0 1.152 0.832zM188.032 570.24L448.64 309.632a89.6 89.6 0 0 1 126.72 0L835.84 570.24 541.76 780.352a51.2 51.2 0 0 1-59.52 0L188.096 570.24z m695.168-61.376l-221.312-221.312a39.04 39.04 0 0 0 1.152-0.832l220.16-165.12V508.864zM98.56 600.704a38.912 38.912 0 0 0 15.616 11.136L437.632 842.88a128 128 0 0 0 148.736 0l323.456-231.04a38.272 38.272 0 0 0 15.552-11.136l7.808-5.568a64 64 0 0 0 26.816-52.096V0a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64V543.04a64 64 0 0 0 26.816 52.096l7.808 5.568z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="zhibiaoziduan" unicode="&#59268;" d="M485.568 701.184c10.624 0 50.432-2.816 53.184 24.448 3.584 34.176-30.656 37.312-46.272 38.976h0.064c-36.992 4.288-114.432 9.856-161.408-20.608-47.04-30.528-74.112-82.816-87.168-145.152L225.472 510.72h-132.48c-15.36 0-27.776-4.416-28.992-32 1.28-15.04 13.568-26.944 28.864-26.944h119.872L133.76 65.792s-20.16-62.976 24.064-65.728c38.592-2.368 46.272 60.48 46.272 60.48l79.616 391.232h101.248a29.44 29.44 0 1 1 0 58.944H296.32l17.408 86.336c37.504 137.472 107.52 104.128 171.904 104.128M916.224 602.24a21.44 21.44 0 0 1-15.616 8.32 32.896 32.896 0 0 1-17.664-1.92l-39.68-15.36 3.2 45.44a16.384 16.384 0 0 1-7.04 14.08 23.04 23.04 0 0 1-13.44 5.12 22.528 22.528 0 0 1-15.04-5.12 17.344 17.344 0 0 1-6.016-14.08v-28.8c0-0.96 0-1.856 0.32-2.944a15.872 15.872 0 0 0 0.32-2.88v-10.88c-6.4 1.28-13.056 3.456-19.904 6.4l-19.84 7.04h0.64a22.784 22.784 0 0 1-14.72 3.84 16.256 16.256 0 0 1-12.16-6.4 29.44 29.44 0 0 1-1.536-19.2c1.408-7.68 4.48-12.352 9.216-14.016l21.12-6.4c6.848-2.176 12.416-3.648 16.64-4.48h2.56c0.448-0.448 0.896-0.64 1.28-0.64h0.64l-29.44-37.12a27.328 27.328 0 0 1 0-30.08V492.8a11.328 11.328 0 0 1 7.424-6.4c3.2-0.896 6.656-1.28 10.56-1.28a24 24 0 0 1 6.976 1.536c3.008 1.088 4.928 2.688 5.76 4.864l34.56 49.28 25.6-42.88v0.64a25.6 25.6 0 0 1 10.624-11.52c5.312-3.52 11.328-4.48 18.24-3.2a17.28 17.28 0 0 1 7.36 6.016 34.88 34.88 0 0 1 4.416 9.344 31.872 31.872 0 0 1 1.664 9.856 14.528 14.528 0 0 1-1.984 8l-33.28 42.944 50.56 13.44c4.736 1.664 8.064 5.632 9.92 11.776a18.88 18.88 0 0 1-2.24 16.96M750.208 424.576a31.936 31.936 0 0 1-45.056-3.968L597.12 291.84 488.96 420.608a32 32 0 1 1-49.024-41.088l115.328-137.472-115.328-137.408a32 32 0 0 1 49.024-41.152l108.16 128.832 108.032-128.832a31.808 31.808 0 0 1 45.056-3.904 32 32 0 0 1 3.968 45.056l-115.328 137.408 115.328 137.472a32 32 0 0 1-3.968 45.056"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yibianji" unicode="&#59269;" d="M384 200.064v-108.608l-15.552-15.552-248.96-22.592 22.656 248.896L685.248 845.248a64 64 0 0 0 90.496 0l135.744-135.744a64 64 0 0 0 0-90.496L612.544 320H503.936l235.712 235.776L622.08 673.408 216.128 267.584l-11.776-129.472 129.472 11.776 50.176 50.176z m0-206.208v-76.8H140.8a38.4 38.4 0 0 0 0 76.8H384z m292.288 733.888l117.696-117.696 54.144 54.208-117.632 117.632-54.208-54.144z m191.488-430.72a38.4 38.4 0 1 0 56.448-52.096l-252.8-274.112a38.4 38.4 0 0 0-56-0.512l-131.2 137.024a38.4 38.4 0 1 0 55.488 53.12l102.912-107.52L867.84 296.96z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="dianjijinru" unicode="&#58976;" d="M702.72 423.104L551.296 574.464a38.4 38.4 0 0 0 54.336 54.272l217.216-217.216a38.4 38.4 0 0 0 0-54.272l-217.216-217.216a38.4 38.4 0 1 0-54.336 54.272l152 152H230.4a38.4 38.4 0 0 0 0 76.8h472.32zM512-128A512 512 0 1 0 512 896a512 512 0 0 0 0-1024z m0 76.8A435.2 435.2 0 1 1 512 819.2a435.2 435.2 0 0 1 0-870.4z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal48" unicode="&#59270;" d="M396.928 650.496L623.36 401.472a32 32 0 0 0 8.32-21.568v-278.72a32 32 0 0 1 54.656-22.656l49.344 49.344a32 32 0 0 1 9.344 22.656V379.904a32 32 0 0 0 8.32 21.568l226.432 248.96a32 32 0 0 1-23.68 53.568H420.608a32 32 0 0 1-23.68-53.504zM258.88 248.192h92.416a25.6 25.6 0 0 0 18.24-43.584L238.72 71.744a25.6 25.6 0 0 0-36.48 0l-130.88 132.864a25.6 25.6 0 0 0 18.24 43.52h92.48V665.6a38.4 38.4 0 0 0 76.8 0v-417.408z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal49" unicode="&#59271;" d="M182.08 519.808H89.6a25.6 25.6 0 0 0-18.24 43.584L202.24 696.256a25.6 25.6 0 0 0 36.48 0l130.816-132.864a25.6 25.6 0 0 0-18.24-43.52H258.88V102.4a38.4 38.4 0 0 0-76.8 0V519.808zM396.928 650.496L623.36 401.472a32 32 0 0 0 8.32-21.568v-278.72a32 32 0 0 1 54.656-22.656l49.344 49.344a32 32 0 0 1 9.344 22.656V379.904a32 32 0 0 0 8.32 21.568l226.432 248.96a32 32 0 0 1-23.68 53.568H420.608a32 32 0 0 1-23.68-53.504z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yulan" unicode="&#59272;" d="M550.4 115.2v-105.6h185.6a38.4 38.4 0 0 0 0-76.8h-448a38.4 38.4 0 1 0 0 76.8h185.6V115.2H192a102.4 102.4 0 0 0-102.4 102.4v512A102.4 102.4 0 0 0 192 832h640a102.4 102.4 0 0 0 102.4-102.4v-512a102.4 102.4 0 0 0-102.4-102.4H550.4z m307.2 236.8V729.6a25.6 25.6 0 0 1-25.6 25.6H192a25.6 25.6 0 0 1-25.6-25.6v-377.6h691.2z m0-76.8H166.4v-57.6c0-14.08 11.52-25.6 25.6-25.6h640a25.6 25.6 0 0 1 25.6 25.6v57.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shenqingguachu" unicode="&#59273;" d="M550.4 540.864v-240.896a38.4 38.4 0 1 0-76.8 0V540.864L347.136 414.464a38.4 38.4 0 0 0-54.272 54.272l192 192a38.4 38.4 0 0 0 54.272 0l192-192a38.4 38.4 0 1 0-54.272-54.272L550.4 540.8zM512 105.40800000000002l-286.272-156.16a70.4 70.4 0 0 0-104.128 61.76V725.12a102.4 102.4 0 0 0 102.4 102.4h576a102.4 102.4 0 0 0 102.4-102.4v-714.112a70.4 70.4 0 0 0-104.128-61.76L512 105.40800000000002z m313.6 619.712a25.6 25.6 0 0 1-25.6 25.6h-576a25.6 25.6 0 0 1-25.6-25.6v-703.36l279.872 152.704a70.4 70.4 0 0 0 67.456 0l279.872-152.64V725.12z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yibiaoban" unicode="&#59274;" d="M213.333333 789.333333h426.666667a21.333333 21.333333 0 0 0 21.333333-21.333333v-170.666667a64 64 0 0 1 64-64h170.666667a21.333333 21.333333 0 0 0 21.333333-21.333333v-426.666667a106.666667 106.666667 0 0 0-106.666666-106.666666H213.333333a106.666667 106.666667 0 0 0-106.666666 106.666666V682.666667a106.666667 106.666667 0 0 0 106.666666 106.666666z m527.082667-36.416l140.501333-140.501333A21.333333 21.333333 0 0 0 865.834667 576H768a64 64 0 0 0-64 64V737.834667a21.333333 21.333333 0 0 0 36.416 15.082666zM330.666667 554.666667a32 32 0 1 1-64 0v-405.333334a32 32 0 0 1 64 0V554.666667z m213.333333-106.666667a32 32 0 1 1-64 0v-298.666667a32 32 0 0 1 64 0V448z m213.333333-106.666667a32 32 0 0 1-64 0v-192a32 32 0 0 1 64 0v192z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal105" unicode="&#59275;" d="M187.733333 405.33333333V738.13333333a25.6 25.6 0 1 0 51.2 0V405.33333333h631.466667a25.6 25.6 0 0 0 0-51.2H238.933333V64.00000033000003a25.6 25.6 0 1 0-51.2 0v290.133333H110.933333a25.6 25.6 0 1 0 0 51.2h76.8z m286.634667 224.853333l-157.610667-157.610666a25.6 25.6 0 0 0-36.181333 36.181333l170.666667 170.666667a25.6 25.6 0 0 0 29.525333 4.821333l156.544-78.293333L795.306667 724.4800003299999a25.6 25.6 0 1 0 30.72-40.96l-170.666667-128a25.6 25.6 0 0 0-26.794667-2.432L474.368 630.18666633z m0-426.666666l-157.610667-157.610667a25.6 25.6 0 0 0-36.181333 36.181333l170.666667 170.666667a25.6 25.6 0 0 0 29.525333 4.821333l156.544-78.293333 157.994667 118.528a25.6 25.6 0 1 0 30.72-40.96l-170.666667-128a25.6 25.6 0 0 0-26.794667-2.432l-154.197333 77.098667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal106" unicode="&#59276;" d="M849.066667 162.13333365999995H174.933333v-55.466667a25.6 25.6 0 1 0-51.2 0v55.466667H68.266667a25.6 25.6 0 1 0 0 51.2h55.466666V652.79999966a25.6 25.6 0 1 0 51.2 0V213.33333366h674.133334V652.79999966a25.6 25.6 0 1 0 51.2 0V213.33333366h55.466666a25.6 25.6 0 0 0 0-51.2h-55.466666v-55.466667a25.6 25.6 0 1 0-51.2 0v55.466667zM274.090667 408.57599966a25.6 25.6 0 0 0-36.181334 36.181334l170.666667 170.666666a25.6 25.6 0 0 0 29.525333 4.821334l156.544-78.293334L752.64 660.47999966a25.6 25.6 0 1 0 30.72-40.96l-170.666667-128a25.6 25.6 0 0 0-26.794666-2.432L431.701333 566.18666666l-157.610666-157.610667zM271.36 235.51999966000005a25.6 25.6 0 1 0-30.72 40.96l170.666667 128a25.6 25.6 0 0 0 26.794666 2.432l154.197334-77.098666 157.610666 157.610666a25.6 25.6 0 0 0 36.181334-36.181333l-170.666667-170.666667a25.6 25.6 0 0 0-29.525333-4.821333l-156.544 78.293333L271.36 235.51999966000005z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="liekuandengfen" unicode="&#59277;" d="M634.112 345.6H389.952a38.72 38.72 0 0 0-5.44 0.384v-143.488a32 32 0 0 0-54.656-22.656l-179.2 179.2a32 32 0 0 0 0 45.312l179.2 179.2a32 32 0 0 0 54.656-22.592v-138.944a38.72 38.72 0 0 0 5.44 0.384h244.16V560.96a32 32 0 0 0 54.592 22.656l179.264-179.264a32 32 0 0 0 0-45.248l-179.2-179.2a32 32 0 0 0-54.656 22.592V345.6zM70.4 704a38.4 38.4 0 0 0 38.4-38.4v-563.2a38.4 38.4 0 0 0-76.8 0V665.6a38.4 38.4 0 0 0 38.4 38.4z m883.2 0a38.4 38.4 0 0 0 38.4-38.4v-563.2a38.4 38.4 0 1 0-76.8 0V665.6a38.4 38.4 0 0 0 38.4 38.4z"  horiz-adv-x="1024" />
+
+    
 
 
   </font>
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index b3f057a3aa..fc77b954ec 100644
Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
index 4610f45f15..2678e8c69b 100644
Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ
diff --git a/dist/resource.css b/dist/resource.css
index b29298149b..765b5eda76 100644
--- a/dist/resource.css
+++ b/dist/resource.css
@@ -820,24 +820,24 @@ textarea::-webkit-scrollbar-thumb:hover {
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6f0;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe64e;');
 }
 .trigger-triangle-font .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:hover .b-font:before,
 .trigger-triangle-font.hover .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:active .b-font:before,
 .trigger-triangle-font.active .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #3685f2;
 }
 .trigger-triangle-font.disabled .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .pull-down-font .b-font {
@@ -948,45 +948,45 @@ textarea::-webkit-scrollbar-thumb:hover {
   color: #faaa39;
 }
 .less-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75f;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75e;');
 }
 .less-font .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:hover .b-font:before,
 .less-font.hover .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:active .b-font:before,
 .less-font.active .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: #3f8ce8;
 }
 .less-font.disabled .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-equal-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe760;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe761;');
 }
 .less-equal-font .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:hover .b-font:before,
 .less-equal-font.hover .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:active .b-font:before,
 .less-equal-font.active .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: #3f8ce8;
 }
 .less-equal-font.disabled .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .text-bold-font .b-font {
diff --git a/dist/widget.js b/dist/widget.js
index 1c4292c724..4796f32a45 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -3772,7 +3772,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
                     break;
                 case this._const.yearMonthLength:
                 case this._const.yearFullMonthLength:
-                    if (this._monthCheck(v)) {
+                    var splitMonth = v.split("-")[1];
+                    if ((BI.isNotNull(splitMonth) && splitMonth.length === 2) || this._monthCheck(v)) {
                         this.editor.setValue(v + "-");
                     }
                     break;
@@ -4711,7 +4712,9 @@ BI.extend(BI.DynamicDateTimeSelect, {
                     }
                     break;
                 case this._const.yearMonthLength:
-                    if (this._monthCheck(v)) {
+                case this._const.yearFullMonthLength:
+                    var splitMonth = v.split("-")[1];
+                    if ((BI.isNotNull(splitMonth) && splitMonth.length === 2) || this._monthCheck(v)) {
                         this.editor.setValue(v + "-");
                     }
                     break;
@@ -13435,7 +13438,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             type: "bi.icon_combo",
             cls: "number-interval-small-combo bi-border",
             height: o.height - 2,
-            isShowDown: false,
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -13454,7 +13456,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-big-combo bi-border",
-            isShowDown: false,
             height: o.height - 2,
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
@@ -16489,19 +16490,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
+                            self._defaultState();
                         });
                     }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self._defaultState();
-                    }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        self.setValue();
-                        self._defaultState();
-                    }
                 }],
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
@@ -17039,13 +17030,12 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
         });
 
         this.popupView = BI.createWidget({
-            type: "bi.multi_popup_view",
+            type: "bi.popup_view",
             stopPropagation: false,
             maxWidth: opts.maxWidth,
             minWidth: opts.minWidth,
             maxHeight: opts.maxHeight,
             element: this,
-            buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")],
             el: this.loader,
             value: opts.value
         });
@@ -17053,16 +17043,6 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
         this.popupView.on(BI.MultiPopupView.EVENT_CHANGE, function () {
             self.fireEvent(BI.SingleSelectPopupView.EVENT_CHANGE);
         });
-        this.popupView.on(BI.MultiPopupView.EVENT_CLICK_TOOLBAR_BUTTON, function (index) {
-            switch (index) {
-                case 0:
-                    self.fireEvent(BI.SingleSelectPopupView.EVENT_CLICK_CLEAR);
-                    break;
-                case 1:
-                    self.fireEvent(BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM);
-                    break;
-            }
-        });
     },
 
     setStartValue: function (v) {
@@ -17091,8 +17071,6 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
 });
 
 BI.SingleSelectPopupView.EVENT_CHANGE = "EVENT_CHANGE";
-BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
-BI.SingleSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
 
 
 BI.shortcut("bi.single_select_popup_view", BI.SingleSelectPopupView);/**
@@ -18023,13 +18001,13 @@ BI.SingleSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
 
 BI.shortcut("bi.single_select_search_add_pane", BI.SingleSelectSearchPane);/**
  *
- * @class BI.SingleSelectCombo
+ * @class BI.SingleSelectInsertCombo
  * @extends BI.Single
  */
-BI.SingleSelectCombo = BI.inherit(BI.Single, {
+BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
-        return BI.extend(BI.SingleSelectCombo.superclass._defaultConfig.apply(this, arguments), {
+        return BI.extend(BI.SingleSelectInsertCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
@@ -18038,7 +18016,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     },
 
     _init: function () {
-        BI.SingleSelectCombo.superclass._init.apply(this, arguments);
+        BI.SingleSelectInsertCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
 
         var assertShowValue = function () {
@@ -18140,19 +18118,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
+                            self._defaultState();
                         });
                     }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self._defaultState();
-                    }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        self.setValue();
-                        self._defaultState();
-                    }
                 }],
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
@@ -18183,7 +18151,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
+                self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
             }
         });
 
@@ -18236,7 +18204,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         this._assertValue(this.storeValue);
         this.requesting = true;
         o.itemsCreator({
-            type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
+            type: BI.SingleSelectInsertCombo.REQ_GET_ALL_DATA,
             keywords: keywords
         }, function (ob) {
             var values = BI.map(ob.items, "value");
@@ -18259,7 +18227,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         this._assertValue(res);
         this.requesting = true;
         o.itemsCreator({
-            type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
+            type: BI.SingleSelectInsertCombo.REQ_GET_ALL_DATA,
             keywords: [this.trigger.getKey()]
         }, function (ob) {
             var items = BI.map(ob.items, "value");
@@ -18296,7 +18264,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         if (!this._count) {
             o.itemsCreator({
-                type: BI.SingleSelectCombo.REQ_GET_DATA_LENGTH
+                type: BI.SingleSelectInsertCombo.REQ_GET_DATA_LENGTH
             }, function (res) {
                 self._count = res.count;
                 adjust();
@@ -18310,7 +18278,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         function adjust () {
             if (self.wants2Quit === true) {
-                self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
+                self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
             }
             self.requesting = false;
@@ -18364,14 +18332,14 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     }
 });
 
-BI.extend(BI.SingleSelectCombo, {
+BI.extend(BI.SingleSelectInsertCombo, {
     REQ_GET_DATA_LENGTH: 0,
     REQ_GET_ALL_DATA: -1
 });
 
-BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
+BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 
-BI.shortcut("bi.single_select_add_combo", BI.SingleSelectCombo);/**
+BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);/**
  *
  * 单选下拉框
  * @class BI.SingleSelectTrigger
@@ -21042,8 +21010,8 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
             vgap: c.vgap,
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             allowBlank: true,
-            errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
+            errorText: function () {
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             }
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
@@ -21330,9 +21298,9 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
         obj = obj || {};
         obj.year = obj.year || 0;
         obj.month = obj.month || 0;
-        if (BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
+        if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
             var year = BI.getDate().getFullYear();
-            this.selectedYear = "";
+            this.selectedYear = year;
             this.selectedMonth = "";
             this.yearPicker.setValue(year);
             this.month.setValue();
@@ -21366,6 +21334,9 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);BI.DynamicYearM
             max: o.max,
             value: o.value || ""
         });
+        this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN, function () {
+            self.combo.isViewVisible() && self.combo.hideView();
+        });
         this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });
@@ -21677,7 +21648,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     switch (v) {
                         case BI.DynamicYearCombo.Static:
                             var date = BI.DynamicDateHelper.getCalculation(self.dynamicPane.getValue());
-                            self.year.setValue({year: date.getFullYear(), month: date.getMonth()});
+                            self.year.setValue({year: date.getFullYear(), month: date.getMonth() + 1});
                             self._setInnerValue();
                             break;
                         case BI.DynamicYearCombo.Dynamic:
@@ -21803,12 +21774,15 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
             },
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") :  BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             },
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true
         });
+        editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
+            self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN);
+        });
         editor.on(BI.SignEditor.EVENT_FOCUS, function () {
             self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_FOCUS);
         });
@@ -21820,16 +21794,14 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
             if (BI.isNotNull(value)) {
                 editor.setValue(value);
             }
-            if (BI.isNotEmptyString(value)) {
-                var monthValue = self.monthEditor.getValue();
-                self.storeValue = {
-                    type: BI.DynamicDateCombo.Static,
-                    value: {
-                        year: self.yearEditor.getValue(),
-                        month: BI.isEmptyString(self.monthEditor.getValue()) ? "" : monthValue
-                    }
-                };
-            }
+            var monthValue = self.monthEditor.getValue();
+            self.storeValue = {
+                type: BI.DynamicDateCombo.Static,
+                value: {
+                    year: self.yearEditor.getValue(),
+                    month: BI.isEmptyString(self.monthEditor.getValue()) ? "" : monthValue
+                }
+            };
             self.setTitle(self._getStaticTitle(self.storeValue.value));
 
             self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);
@@ -21896,8 +21868,8 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
 
     _getStaticTitle: function (value) {
         value = value || {};
-        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year + "-";
-        var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : value.month;
+        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
+        var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
         return yearStr + monthStr;
     },
 
@@ -21946,6 +21918,7 @@ BI.DynamicYearMonthTrigger.EVENT_ERROR = "EVENT_ERROR";
 BI.DynamicYearMonthTrigger.EVENT_START = "EVENT_START";
 BI.DynamicYearMonthTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
+BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
 BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
     constants: {
         height: 26,
@@ -22300,9 +22273,9 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
         obj = obj || {};
         obj.year = obj.year || 0;
         obj.quarter = obj.quarter || 0;
-        if (BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
+        if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
             var year = BI.getDate().getFullYear();
-            this.selectedYear = "";
+            this.selectedYear = year;
             this.selectedQuarter = "";
             this.yearPicker.setValue(year);
             this.quarter.setValue();
@@ -22336,6 +22309,9 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);BI.DynamicY
             max: o.max,
             value: o.value || ""
         });
+        this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN, function () {
+            self.combo.isViewVisible() && self.combo.hideView();
+        });
         this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });
@@ -22746,13 +22722,16 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
                 return false;
             },
             errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             },
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true
         });
+        editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
+            self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN);
+        });
         editor.on(BI.SignEditor.EVENT_FOCUS, function () {
             self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_FOCUS);
         });
@@ -22764,16 +22743,14 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
             if (BI.isNotNull(value)) {
                 editor.setValue(value);
             }
-            if (BI.isNotEmptyString(value)) {
-                var quarterValue = self.quarterEditor.getValue();
-                self.storeValue = {
-                    type: BI.DynamicYearQuarterCombo.Static,
-                    value: {
-                        year: self.yearEditor.getValue(),
-                        quarter: BI.isEmptyString(self.quarterEditor.getValue()) ? "" : quarterValue
-                    }
-                };
-            }
+            var quarterValue = self.quarterEditor.getValue();
+            self.storeValue = {
+                type: BI.DynamicYearQuarterCombo.Static,
+                value: {
+                    year: self.yearEditor.getValue(),
+                    quarter: BI.isEmptyString(self.quarterEditor.getValue()) ? "" : quarterValue
+                }
+            };
             self.setTitle(self._getStaticTitle(self.storeValue.value));
 
             self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
@@ -22813,8 +22790,8 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
 
     _getStaticTitle: function (value) {
         value = value || {};
-        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year + "-";
-        var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : value.quarter;
+        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
+        var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
         return yearStr + quarterStr;
     },
 
@@ -22872,6 +22849,7 @@ BI.DynamicYearQuarterTrigger.EVENT_ERROR = "EVENT_ERROR";
 BI.DynamicYearQuarterTrigger.EVENT_START = "EVENT_START";
 BI.DynamicYearQuarterTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearQuarterTrigger.EVENT_STOP = "EVENT_STOP";
+BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
 BI.shortcut("bi.dynamic_year_quarter_trigger", BI.DynamicYearQuarterTrigger);/**
  * 简单的复选下拉框控件, 适用于数据量少的情况， 与valuechooser的区别是allvaluechooser setValue和getValue返回的是所有值
  * 封装了字段处理逻辑
diff --git a/public/css/font.css b/public/css/font.css
index da93ad8cdf..8838c6cdad 100644
--- a/public/css/font.css
+++ b/public/css/font.css
@@ -499,24 +499,24 @@
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6f0;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe64e;');
 }
 .trigger-triangle-font .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:hover .b-font:before,
 .trigger-triangle-font.hover .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:active .b-font:before,
 .trigger-triangle-font.active .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #3685f2;
 }
 .trigger-triangle-font.disabled .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .pull-down-font .b-font {
@@ -627,45 +627,45 @@
   color: #faaa39;
 }
 .less-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75f;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75e;');
 }
 .less-font .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:hover .b-font:before,
 .less-font.hover .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:active .b-font:before,
 .less-font.active .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: #3f8ce8;
 }
 .less-font.disabled .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-equal-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe760;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe761;');
 }
 .less-equal-font .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:hover .b-font:before,
 .less-equal-font.hover .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:active .b-font:before,
 .less-equal-font.active .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: #3f8ce8;
 }
 .less-equal-font.disabled .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .text-bold-font .b-font {
diff --git a/src/case/combo/iconcombo/combo.icon.js b/src/case/combo/iconcombo/combo.icon.js
index 040e9e1a81..84185a4f8e 100644
--- a/src/case/combo/iconcombo/combo.icon.js
+++ b/src/case/combo/iconcombo/combo.icon.js
@@ -20,8 +20,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             adjustXOffset: 0,
             adjustYOffset: 0,
             offsetStyle: "left",
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            isShowDown: true
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
         });
     },
 
@@ -37,8 +36,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             height: o.height,
             iconWidth: o.iconWidth,
             iconHeight: o.iconHeight,
-            value: o.value,
-            isShowDown: o.isShowDown
+            value: o.value
         });
         this.popup = BI.createWidget(o.popup, {
             type: "bi.icon_combo_popup",
diff --git a/src/case/combo/iconcombo/trigger.iconcombo.js b/src/case/combo/iconcombo/trigger.iconcombo.js
index 3529d1bc02..7d1c4431ac 100644
--- a/src/case/combo/iconcombo/trigger.iconcombo.js
+++ b/src/case/combo/iconcombo/trigger.iconcombo.js
@@ -41,7 +41,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
             disableSelected: true,
             cls: "icon-combo-down-icon trigger-triangle-font",
             width: 12,
-            height: o.height,
+            height: 8,
             selected: BI.isNotEmptyString(iconCls)
         });
         this.down.setVisible(o.isShowDown);
diff --git a/src/css/resource/font.css b/src/css/resource/font.css
index d5d59fcbe6..3ab1bb65cf 100644
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@@ -499,24 +499,24 @@
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6f0;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe64e;');
 }
 .trigger-triangle-font .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:hover .b-font:before,
 .trigger-triangle-font.hover .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:active .b-font:before,
 .trigger-triangle-font.active .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #3685f2;
 }
 .trigger-triangle-font.disabled .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .pull-down-font .b-font {
@@ -627,45 +627,45 @@
   color: #faaa39;
 }
 .less-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75f;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75e;');
 }
 .less-font .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:hover .b-font:before,
 .less-font.hover .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:active .b-font:before,
 .less-font.active .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: #3f8ce8;
 }
 .less-font.disabled .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-equal-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe760;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe761;');
 }
 .less-equal-font .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:hover .b-font:before,
 .less-equal-font.hover .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:active .b-font:before,
 .less-equal-font.active .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: #3f8ce8;
 }
 .less-equal-font.disabled .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .text-bold-font .b-font {
diff --git a/src/less/lib/font.less b/src/less/lib/font.less
index e3ae6bf281..bc9236a93e 100644
--- a/src/less/lib/font.less
+++ b/src/less/lib/font.less
@@ -18,9 +18,9 @@
 @font-arrow-right: "e70c";
 @font-change: "e72f";
 @font-dot: "e762";
-@font-no-sort-no-filter: "e6f0";
-@font-less: "e75f";
-@font-less-equal: "e760";
+@font-no-sort-no-filter: "e64e";
+@font-less: "e75e";
+@font-less-equal: "e761";
 
 @font-bold: "e75b";
 @font-italic: "e75c";
diff --git a/src/widget/dynamicdate/dynamicdate.trigger.js b/src/widget/dynamicdate/dynamicdate.trigger.js
index d14b80caa1..733e2a144b 100644
--- a/src/widget/dynamicdate/dynamicdate.trigger.js
+++ b/src/widget/dynamicdate/dynamicdate.trigger.js
@@ -119,7 +119,8 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
                     break;
                 case this._const.yearMonthLength:
                 case this._const.yearFullMonthLength:
-                    if (this._monthCheck(v)) {
+                    var splitMonth = v.split("-")[1];
+                    if ((BI.isNotNull(splitMonth) && splitMonth.length === 2) || this._monthCheck(v)) {
                         this.editor.setValue(v + "-");
                     }
                     break;
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
index 7f53564a9b..fa15aee1ce 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
@@ -121,7 +121,9 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
                     }
                     break;
                 case this._const.yearMonthLength:
-                    if (this._monthCheck(v)) {
+                case this._const.yearFullMonthLength:
+                    var splitMonth = v.split("-")[1];
+                    if ((BI.isNotNull(splitMonth) && splitMonth.length === 2) || this._monthCheck(v)) {
                         this.editor.setValue(v + "-");
                     }
                     break;
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index 0f3cfcc137..b7abef11f1 100644
--- a/src/widget/numberinterval/numberinterval.js
+++ b/src/widget/numberinterval/numberinterval.js
@@ -123,7 +123,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             type: "bi.icon_combo",
             cls: "number-interval-small-combo bi-border",
             height: o.height - 2,
-            isShowDown: false,
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -142,7 +141,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-big-combo bi-border",
-            isShowDown: false,
             height: o.height - 2,
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js
index d556ee45d3..ecd8d37d12 100644
--- a/src/widget/singleselect/singleselect.combo.js
+++ b/src/widget/singleselect/singleselect.combo.js
@@ -118,19 +118,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
+                            self._defaultState();
                         });
                     }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self._defaultState();
-                    }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        self.setValue();
-                        self._defaultState();
-                    }
                 }],
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
diff --git a/src/widget/singleselect/singleselect.popup.view.js b/src/widget/singleselect/singleselect.popup.view.js
index 5d33b8c9bc..a29164ba2f 100644
--- a/src/widget/singleselect/singleselect.popup.view.js
+++ b/src/widget/singleselect/singleselect.popup.view.js
@@ -30,13 +30,12 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
         });
 
         this.popupView = BI.createWidget({
-            type: "bi.multi_popup_view",
+            type: "bi.popup_view",
             stopPropagation: false,
             maxWidth: opts.maxWidth,
             minWidth: opts.minWidth,
             maxHeight: opts.maxHeight,
             element: this,
-            buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")],
             el: this.loader,
             value: opts.value
         });
@@ -44,16 +43,6 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
         this.popupView.on(BI.MultiPopupView.EVENT_CHANGE, function () {
             self.fireEvent(BI.SingleSelectPopupView.EVENT_CHANGE);
         });
-        this.popupView.on(BI.MultiPopupView.EVENT_CLICK_TOOLBAR_BUTTON, function (index) {
-            switch (index) {
-                case 0:
-                    self.fireEvent(BI.SingleSelectPopupView.EVENT_CLICK_CLEAR);
-                    break;
-                case 1:
-                    self.fireEvent(BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM);
-                    break;
-            }
-        });
     },
 
     setStartValue: function (v) {
@@ -82,8 +71,6 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, {
 });
 
 BI.SingleSelectPopupView.EVENT_CHANGE = "EVENT_CHANGE";
-BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
-BI.SingleSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
 
 
 BI.shortcut("bi.single_select_popup_view", BI.SingleSelectPopupView);
\ No newline at end of file
diff --git a/src/widget/singleselectaddsearch/singleselect.combo.js b/src/widget/singleselectaddsearch/singleselect.combo.js
index 6280e67638..c0abdf60dc 100644
--- a/src/widget/singleselectaddsearch/singleselect.combo.js
+++ b/src/widget/singleselectaddsearch/singleselect.combo.js
@@ -1,12 +1,12 @@
 /**
  *
- * @class BI.SingleSelectCombo
+ * @class BI.SingleSelectInsertCombo
  * @extends BI.Single
  */
-BI.SingleSelectCombo = BI.inherit(BI.Single, {
+BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
-        return BI.extend(BI.SingleSelectCombo.superclass._defaultConfig.apply(this, arguments), {
+        return BI.extend(BI.SingleSelectInsertCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
@@ -15,7 +15,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     },
 
     _init: function () {
-        BI.SingleSelectCombo.superclass._init.apply(this, arguments);
+        BI.SingleSelectInsertCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
 
         var assertShowValue = function () {
@@ -117,19 +117,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
+                            self._defaultState();
                         });
                     }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self._defaultState();
-                    }
-                }, {
-                    eventName: BI.SingleSelectPopupView.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        self.setValue();
-                        self._defaultState();
-                    }
                 }],
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
@@ -160,7 +150,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
+                self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
             }
         });
 
@@ -213,7 +203,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         this._assertValue(this.storeValue);
         this.requesting = true;
         o.itemsCreator({
-            type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
+            type: BI.SingleSelectInsertCombo.REQ_GET_ALL_DATA,
             keywords: keywords
         }, function (ob) {
             var values = BI.map(ob.items, "value");
@@ -236,7 +226,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         this._assertValue(res);
         this.requesting = true;
         o.itemsCreator({
-            type: BI.SingleSelectCombo.REQ_GET_ALL_DATA,
+            type: BI.SingleSelectInsertCombo.REQ_GET_ALL_DATA,
             keywords: [this.trigger.getKey()]
         }, function (ob) {
             var items = BI.map(ob.items, "value");
@@ -273,7 +263,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         if (!this._count) {
             o.itemsCreator({
-                type: BI.SingleSelectCombo.REQ_GET_DATA_LENGTH
+                type: BI.SingleSelectInsertCombo.REQ_GET_DATA_LENGTH
             }, function (res) {
                 self._count = res.count;
                 adjust();
@@ -287,7 +277,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         function adjust () {
             if (self.wants2Quit === true) {
-                self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
+                self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
             }
             self.requesting = false;
@@ -341,11 +331,11 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     }
 });
 
-BI.extend(BI.SingleSelectCombo, {
+BI.extend(BI.SingleSelectInsertCombo, {
     REQ_GET_DATA_LENGTH: 0,
     REQ_GET_ALL_DATA: -1
 });
 
-BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
+BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 
-BI.shortcut("bi.single_select_add_combo", BI.SingleSelectCombo);
\ No newline at end of file
+BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);
\ No newline at end of file
diff --git a/src/widget/year/trigger.year.js b/src/widget/year/trigger.year.js
index ac30fedf16..6b7b958de2 100644
--- a/src/widget/year/trigger.year.js
+++ b/src/widget/year/trigger.year.js
@@ -28,8 +28,8 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
             vgap: c.vgap,
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             allowBlank: true,
-            errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
+            errorText: function () {
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             }
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js
index f665fa6610..d208ba6d20 100644
--- a/src/widget/yearmonth/card.static.yearmonth.js
+++ b/src/widget/yearmonth/card.static.yearmonth.js
@@ -98,9 +98,9 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
         obj = obj || {};
         obj.year = obj.year || 0;
         obj.month = obj.month || 0;
-        if (BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
+        if (obj.year === 0 || obj.month === 0 || BI.checkDateVoid(obj.year, obj.month, 1, o.min, o.max)[0]) {
             var year = BI.getDate().getFullYear();
-            this.selectedYear = "";
+            this.selectedYear = year;
             this.selectedMonth = "";
             this.yearPicker.setValue(year);
             this.month.setValue();
diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js
index 90d693a192..a0d47d3527 100644
--- a/src/widget/yearmonth/combo.yearmonth.js
+++ b/src/widget/yearmonth/combo.yearmonth.js
@@ -19,6 +19,9 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             max: o.max,
             value: o.value || ""
         });
+        this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN, function () {
+            self.combo.isViewVisible() && self.combo.hideView();
+        });
         this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });
diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js
index 86e98d340d..067a66844b 100644
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@@ -149,7 +149,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     switch (v) {
                         case BI.DynamicYearCombo.Static:
                             var date = BI.DynamicDateHelper.getCalculation(self.dynamicPane.getValue());
-                            self.year.setValue({year: date.getFullYear(), month: date.getMonth()});
+                            self.year.setValue({year: date.getFullYear(), month: date.getMonth() + 1});
                             self._setInnerValue();
                             break;
                         case BI.DynamicYearCombo.Dynamic:
diff --git a/src/widget/yearmonth/trigger.yearmonth.js b/src/widget/yearmonth/trigger.yearmonth.js
index 534c7e568a..c58f3f6229 100644
--- a/src/widget/yearmonth/trigger.yearmonth.js
+++ b/src/widget/yearmonth/trigger.yearmonth.js
@@ -70,12 +70,15 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
             },
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") :  BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             },
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true
         });
+        editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
+            self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN);
+        });
         editor.on(BI.SignEditor.EVENT_FOCUS, function () {
             self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_FOCUS);
         });
@@ -87,16 +90,14 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
             if (BI.isNotNull(value)) {
                 editor.setValue(value);
             }
-            if (BI.isNotEmptyString(value)) {
-                var monthValue = self.monthEditor.getValue();
-                self.storeValue = {
-                    type: BI.DynamicDateCombo.Static,
-                    value: {
-                        year: self.yearEditor.getValue(),
-                        month: BI.isEmptyString(self.monthEditor.getValue()) ? "" : monthValue
-                    }
-                };
-            }
+            var monthValue = self.monthEditor.getValue();
+            self.storeValue = {
+                type: BI.DynamicDateCombo.Static,
+                value: {
+                    year: self.yearEditor.getValue(),
+                    month: BI.isEmptyString(self.monthEditor.getValue()) ? "" : monthValue
+                }
+            };
             self.setTitle(self._getStaticTitle(self.storeValue.value));
 
             self.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);
@@ -163,8 +164,8 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
 
     _getStaticTitle: function (value) {
         value = value || {};
-        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year + "-";
-        var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : value.month;
+        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
+        var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
         return yearStr + monthStr;
     },
 
@@ -213,4 +214,5 @@ BI.DynamicYearMonthTrigger.EVENT_ERROR = "EVENT_ERROR";
 BI.DynamicYearMonthTrigger.EVENT_START = "EVENT_START";
 BI.DynamicYearMonthTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
+BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
 BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);
\ No newline at end of file
diff --git a/src/widget/yearquarter/card.static.yearquarter.js b/src/widget/yearquarter/card.static.yearquarter.js
index 4413a1644f..8e0fc27fa9 100644
--- a/src/widget/yearquarter/card.static.yearquarter.js
+++ b/src/widget/yearquarter/card.static.yearquarter.js
@@ -90,9 +90,9 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
         obj = obj || {};
         obj.year = obj.year || 0;
         obj.quarter = obj.quarter || 0;
-        if (BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
+        if (obj.quarter === 0 || obj.year === 0 || BI.checkDateVoid(obj.year, obj.quarter, 1, o.min, o.max)[0]) {
             var year = BI.getDate().getFullYear();
-            this.selectedYear = "";
+            this.selectedYear = year;
             this.selectedQuarter = "";
             this.yearPicker.setValue(year);
             this.quarter.setValue();
diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js
index c8841d5407..99a19c6624 100644
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@@ -19,6 +19,9 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             max: o.max,
             value: o.value || ""
         });
+        this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN, function () {
+            self.combo.isViewVisible() && self.combo.hideView();
+        });
         this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });
diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js
index edc0c20a0e..8c3108a88d 100644
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@@ -69,13 +69,16 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
                 return false;
             },
             errorText: function (v) {
-                return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                return BI.i18nText("BI-Year_Trigger_Invalid_Text");
             },
             watermark: BI.i18nText("BI-Basic_Unrestricted"),
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true
         });
+        editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
+            self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN);
+        });
         editor.on(BI.SignEditor.EVENT_FOCUS, function () {
             self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_FOCUS);
         });
@@ -87,16 +90,14 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
             if (BI.isNotNull(value)) {
                 editor.setValue(value);
             }
-            if (BI.isNotEmptyString(value)) {
-                var quarterValue = self.quarterEditor.getValue();
-                self.storeValue = {
-                    type: BI.DynamicYearQuarterCombo.Static,
-                    value: {
-                        year: self.yearEditor.getValue(),
-                        quarter: BI.isEmptyString(self.quarterEditor.getValue()) ? "" : quarterValue
-                    }
-                };
-            }
+            var quarterValue = self.quarterEditor.getValue();
+            self.storeValue = {
+                type: BI.DynamicYearQuarterCombo.Static,
+                value: {
+                    year: self.yearEditor.getValue(),
+                    quarter: BI.isEmptyString(self.quarterEditor.getValue()) ? "" : quarterValue
+                }
+            };
             self.setTitle(self._getStaticTitle(self.storeValue.value));
 
             self.fireEvent(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM);
@@ -136,8 +137,8 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
 
     _getStaticTitle: function (value) {
         value = value || {};
-        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year + "-";
-        var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : value.quarter;
+        var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
+        var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
         return yearStr + quarterStr;
     },
 
@@ -195,4 +196,5 @@ BI.DynamicYearQuarterTrigger.EVENT_ERROR = "EVENT_ERROR";
 BI.DynamicYearQuarterTrigger.EVENT_START = "EVENT_START";
 BI.DynamicYearQuarterTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearQuarterTrigger.EVENT_STOP = "EVENT_STOP";
+BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
 BI.shortcut("bi.dynamic_year_quarter_trigger", BI.DynamicYearQuarterTrigger);
\ No newline at end of file
diff --git a/ui/css/font.css b/ui/css/font.css
index fb1c090e39..dfc6792156 100644
--- a/ui/css/font.css
+++ b/ui/css/font.css
@@ -499,24 +499,24 @@
   color: inherit;
 }
 .trigger-triangle-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6f0;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe64e;');
 }
 .trigger-triangle-font .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:hover .b-font:before,
 .trigger-triangle-font.hover .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .trigger-triangle-font:active .b-font:before,
 .trigger-triangle-font.active .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #3685f2;
 }
 .trigger-triangle-font.disabled .b-font:before {
-  content: "\e6f0";
+  content: "\e64e";
   color: #999999;
 }
 .pull-down-font .b-font {
@@ -627,45 +627,45 @@
   color: #faaa39;
 }
 .less-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75f;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe75e;');
 }
 .less-font .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:hover .b-font:before,
 .less-font.hover .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-font:active .b-font:before,
 .less-font.active .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: #3f8ce8;
 }
 .less-font.disabled .b-font:before {
-  content: "\e75f";
+  content: "\e75e";
   color: inherit;
 }
 .less-equal-font .b-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe760;');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe761;');
 }
 .less-equal-font .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:hover .b-font:before,
 .less-equal-font.hover .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .less-equal-font:active .b-font:before,
 .less-equal-font.active .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: #3f8ce8;
 }
 .less-equal-font.disabled .b-font:before {
-  content: "\e760";
+  content: "\e761";
   color: inherit;
 }
 .text-bold-font .b-font {