From 865ecc13a949df9d2b30090d95eabae34b2a1529 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 25 Apr 2018 14:29:23 +0800 Subject: [PATCH] BI-18932 && BI-18840 && BI-18907 && BI-18927 --- dist/bundle.css | 30 ++-- dist/bundle.js | 156 ++++++++---------- dist/case.js | 8 +- dist/fineui.css | 30 ++-- dist/font/iconfont.eot | Bin 65028 -> 67476 bytes dist/font/iconfont.svg | 41 ++++- dist/font/iconfont.ttf | Bin 64860 -> 67308 bytes dist/font/iconfont.woff | Bin 34176 -> 35624 bytes dist/resource.css | 30 ++-- dist/widget.js | 148 +++++++---------- public/css/font.css | 30 ++-- src/case/combo/iconcombo/combo.icon.js | 6 +- src/case/combo/iconcombo/trigger.iconcombo.js | 2 +- src/css/resource/font.css | 30 ++-- src/less/lib/font.less | 6 +- src/widget/dynamicdate/dynamicdate.trigger.js | 3 +- .../dynamicdatetime.trigger.js | 4 +- src/widget/numberinterval/numberinterval.js | 2 - src/widget/singleselect/singleselect.combo.js | 12 +- .../singleselect/singleselect.popup.view.js | 15 +- .../singleselect.combo.js | 36 ++-- src/widget/year/trigger.year.js | 4 +- src/widget/yearmonth/card.static.yearmonth.js | 4 +- src/widget/yearmonth/combo.yearmonth.js | 3 + src/widget/yearmonth/popup.yearmonth.js | 2 +- src/widget/yearmonth/trigger.yearmonth.js | 28 ++-- .../yearquarter/card.static.yearquarter.js | 4 +- src/widget/yearquarter/combo.yearquarter.js | 3 + src/widget/yearquarter/trigger.yearquarter.js | 28 ++-- ui/css/font.css | 30 ++-- 30 files changed, 328 insertions(+), 367 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index 4e7332708..73ed85675 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 2211b6aee..1c2e82dec 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); @@ -90926,7 +90924,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; @@ -91865,7 +91864,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; @@ -100589,7 +100590,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", @@ -100608,7 +100608,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") + ")", @@ -103643,19 +103642,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, @@ -104193,13 +104182,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 }); @@ -104207,16 +104195,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) { @@ -104245,8 +104223,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);/** @@ -105177,13 +105153,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, @@ -105192,7 +105168,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 () { @@ -105294,19 +105270,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, @@ -105337,7 +105303,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); } }); @@ -105390,7 +105356,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"); @@ -105413,7 +105379,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"); @@ -105450,7 +105416,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(); @@ -105464,7 +105430,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; @@ -105518,14 +105484,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 @@ -108196,8 +108162,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 () { @@ -108484,9 +108450,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(); @@ -108520,6 +108486,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(); }); @@ -108831,7 +108800,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: @@ -108957,12 +108926,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); }); @@ -108974,16 +108946,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); @@ -109050,8 +109020,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; }, @@ -109100,6 +109070,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, @@ -109454,9 +109425,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(); @@ -109490,6 +109461,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(); }); @@ -109900,13 +109874,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); }); @@ -109918,16 +109895,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); @@ -109967,8 +109942,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; }, @@ -110026,6 +110001,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 95a2045be..5ad316c71 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 a8fec7156..803e44c43 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 4b831c55d979991a92851d7d289dc2d6658e17a5..94a8128aa83dbf68c4f6decb9b0f06c925d993a0 100644 GIT binary patch delta 3762 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 J)g1$b{1;jiAi@9u delta 1100 zcmZuveN08pB^6kE3g$Yt1% za`SY6NHUS6$(!qKGWJhMW=H^F>DM2%&orJ!`;ZRbMjxT`d?$5_!OarY;g$GRpzZ@5 zw{%1&0njVJP&4GJ667R8LGNnY>KChDu70)p%NnzG9)B#+C(pw?+<`@ufjaSB$+!Fm zyWc|u7bW0@q|2hM02u>n8-kbau!~Z6GKaqd3&x!i$UeOs-j8n$P#qY3M_B8vQ zNo_iAnm4P><0VisU9wV|R_ZUkR+dl}E{l~L%cB)(74C{y<$=nnN};u6Cd{YGZ6V8)qA`MeUS5!+yd(Y`^Wuatt~CsGF#- z>#yIa7r5s*EobE1+%c|?o8}&HTTZpJ(An*ra>iWXDt8UKW?jn-)H>O2FUS*xqO2?7m zq+My5gkAjMa9;5ZWscM=%~svhvk0+z)F@R-yAq|+#I9$CP>NUsr8TffmSRbf5l8S4 zht%I39-?JS^f|f!w7`ND+~CE^5rZN-1MO9$Ajz&A168CjBNg_H1DZISRzyb?j$ zUP{Z)l#^;A7^M~W?WO;>vEh==fDRy&e*0}bOC`uN^HZsQy-6q_J(6`C{iBiCGZG!( zn?_UUf}Qy2iDdYEaeP&_*i^Ow - + @@ -531,7 +531,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q- - + @@ -543,7 +543,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q- - + @@ -837,7 +837,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q- - + @@ -924,6 +924,39 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index b3f057a3aa726ef99f4cab69aa377604000e342f..fc77b954ec5dc5efe0a55cfce33a90a5ac7ea712 100644 GIT binary patch delta 3723 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 diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff index 4610f45f15900add597490964f63af81e011be59..2678e8c69b52cd973e9b28218c26eb4bb08a1e33 100644 GIT binary patch delta 34895 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

mdIVhbWfq&B< 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 HpNfh38*XUk diff --git a/dist/resource.css b/dist/resource.css index b29298149..765b5eda7 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 = ''); + *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 { @@ -948,45 +948,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/widget.js b/dist/widget.js index 1c4292c72..4796f32a4 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 da93ad8cd..8838c6cda 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 = ''); + *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 { @@ -627,45 +627,45 @@ 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/src/case/combo/iconcombo/combo.icon.js b/src/case/combo/iconcombo/combo.icon.js index 040e9e1a8..84185a4f8 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 3529d1bc0..7d1c4431a 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 d5d59fcbe..3ab1bb65c 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 = ''); + *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 { @@ -627,45 +627,45 @@ 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/src/less/lib/font.less b/src/less/lib/font.less index e3ae6bf28..bc9236a93 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 d14b80caa..733e2a144 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 7f53564a9..fa15aee1c 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 0f3cfcc13..b7abef11f 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 d556ee45d..ecd8d37d1 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 5d33b8c9b..a29164ba2 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 6280e6763..c0abdf60d 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 ac30fedf1..6b7b958de 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 f665fa661..d208ba6d2 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 90d693a19..a0d47d352 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 86e98d340..067a66844 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 534c7e568..c58f3f622 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 4413a1644..8e0fc27fa 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 c8841d540..99a19c662 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 edc0c20a0..8c3108a88 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 fb1c090e3..dfc679215 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 = ''); + *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 { @@ -627,45 +627,45 @@ 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 {