diff --git a/bi/base.js b/bi/base.js index 21bf79c3d..97e6e385e 100644 --- a/bi/base.js +++ b/bi/base.js @@ -18489,6 +18489,9 @@ BI.Icon = BI.inherit(BI.Single, { }, _init: function () { BI.Icon.superclass._init.apply(this, arguments); + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } } }); BI.shortcut("bi.icon", BI.Icon);/** diff --git a/bi/core.css b/bi/core.css index 151794401..b09047d83 100644 --- a/bi/core.css +++ b/bi/core.css @@ -3900,7 +3900,7 @@ i { .bi-list-item-none:hover, .bi-list-item-none.hover { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-list-item-none:hover .bi-input, .bi-list-item-none.hover .bi-input { @@ -3913,7 +3913,7 @@ i { .bi-list-item-none:active, .bi-list-item-none.active { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-list-item-none:active .bi-input, .bi-list-item-none.active .bi-input { @@ -3951,7 +3951,7 @@ i { .bi-theme-dark .bi-list-item-none:hover, .bi-theme-dark .bi-list-item-none.hover { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-theme-dark .bi-list-item-none:hover .bi-input, .bi-theme-dark .bi-list-item-none.hover .bi-input { @@ -3964,7 +3964,7 @@ i { .bi-theme-dark .bi-list-item-none:active, .bi-theme-dark .bi-list-item-none.active { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-theme-dark .bi-list-item-none:active .bi-input, .bi-theme-dark .bi-list-item-none.active .bi-input { diff --git a/bi/widget.css b/bi/widget.css index d07adc5bf..7d03e3948 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -1,5 +1,5 @@ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement .arrangement-helper { background: #3f8ce8; z-index: 1000000000; @@ -39,86 +39,86 @@ .bi-arrangement-droppable { z-index: 100000; } -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-adapt-editor .adapt-editor-text { - font-size: 14px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/*************BI.SearchEditor******************/ -.bi-search-editor { - border: 1px solid #d4dadd; -} -.bi-search-editor .close-font { - font-size: 20px; -} -.bi-search-editor .search-font { - font-size: 20px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/*************BI.SearchEditor******************/ -.bi-small-search-editor .bi-editor { - font-size: 12px; -} -.bi-small-search-editor .bi-editor .bi-input { - font-size: 12px; -} -.bi-small-search-editor .bi-editor .bi-label { - font-size: 12px; -} -.bi-small-search-editor .close-font { - font-size: 18px; -} -.bi-small-search-editor .search-font { - font-size: 18px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-sign-initial-editor .sign-initial-editor-text { - font-size: 14px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-sign-style-editor .sign-style-editor-text { - max-width: 100%; - font-size: 12px; -} -.bi-sign-style-editor .sign-style-editor-tip { - max-width: 100%; - font-size: 12px; - color: #808080; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-text-editor { - border: 1px solid #d4dadd; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/*************BI.SearchEditor******************/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-adapt-editor .adapt-editor-text { + font-size: 14px; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/*************BI.SearchEditor******************/ +.bi-search-editor { + border: 1px solid #d4dadd; +} +.bi-search-editor .close-font { + font-size: 20px; +} +.bi-search-editor .search-font { + font-size: 20px; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/*************BI.SearchEditor******************/ +.bi-small-search-editor .bi-editor { + font-size: 12px; +} +.bi-small-search-editor .bi-editor .bi-input { + font-size: 12px; +} +.bi-small-search-editor .bi-editor .bi-label { + font-size: 12px; +} +.bi-small-search-editor .close-font { + font-size: 18px; +} +.bi-small-search-editor .search-font { + font-size: 18px; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-sign-initial-editor .sign-initial-editor-text { + font-size: 14px; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-sign-style-editor .sign-style-editor-text { + max-width: 100%; + font-size: 12px; +} +.bi-sign-style-editor .sign-style-editor-tip { + max-width: 100%; + font-size: 12px; + color: #808080; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-text-editor { + border: 1px solid #d4dadd; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/*************BI.SearchEditor******************/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-date-trigger { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-down-list-popup .bi-down-list-item .list-item-text { max-width: 203px; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table > div.bottom-right > div > div > table { border-right: 1px solid #d4dadd; } @@ -128,12 +128,12 @@ .bi-excel-table-header-cell { font-weight: bold; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; } @@ -148,8 +148,8 @@ background-color: #191b2b; color: #999999; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-fine-tuning-number-editor { -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -162,10 +162,10 @@ .bi-interactive-arrangement .interactive-arrangement-dragtag-icon { z-index: 1000000000; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-month-trigger { -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -174,13 +174,13 @@ .bi-multi-select-check-pane .multi-select-check-selected { text-decoration: underline; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-combo .multi-select-trigger-icon-button { font-size: 16px; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-trigger { -webkit-border-radius: 2px 2px 2px 2px; -moz-border-radius: 2px 2px 2px 2px; @@ -192,27 +192,27 @@ .bi-multi-select-check-selected-button { z-index: 1; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-check-pane .multi-tree-check-selected { color: #3f8ce8; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-combo .multi-select-trigger-icon-button { font-size: 16px; } .bi-multi-tree-popup .popup-view-tree { min-height: 170px; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-check-selected-button .trigger-check-selected { color: #3f8ce8; z-index: 1; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-numerical-interval .numerical-interval-small-editor { -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; @@ -254,8 +254,8 @@ .bi-numerical-interval.number-error .bi-input { color: #e85050; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-page-table-cell { -webkit-user-select: initial; -khtml-user-select: initial; @@ -264,8 +264,8 @@ -o-user-select: initial; user-select: initial; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-path-chooser .path-chooser-radio { z-index: 1; } @@ -299,17 +299,17 @@ min-width: 80px; max-width: 220px; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-quarter-trigger { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-relation-view-region .relation-view-region-container { z-index: 1; -webkit-border-radius: 2px; @@ -365,8 +365,8 @@ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-sequence-table-tree-number .sequence-table-title-cell { overflow: hidden; overflow-x: hidden; @@ -390,10 +390,10 @@ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ } -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-popup .year-popup-navigation { line-height: 30px; } diff --git a/bi/widget.js b/bi/widget.js index 5580c64d8..506e61409 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -3866,6 +3866,525 @@ BI.DatePaneWidget = BI.inherit(BI.Widget, { }); BI.shortcut("bi.date_pane_widget", BI.DatePaneWidget);/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeCombo = BI.inherit(BI.Single, { + constants: { + popupHeight: 290, + popupWidth: 270, + comboAdjustHeight: 1, + border: 1, + DATE_MIN_VALUE: "1900-01-01", + DATE_MAX_VALUE: "2099-12-31" + }, + _defaultConfig: function () { + return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), { + baseCls: 'bi-date-time-combo', + height: 24 + }); + }, + _init: function () { + BI.DateTimeCombo.superclass._init.apply(this, arguments); + var self = this; + var date = new Date(); + this.storeValue = { + value: { + year: date.getFullYear(), + month: date.getMonth(), + day: date.getDate(), + hour: date.getHours(), + minute: date.getMinutes(), + second: date.getSeconds() + } + }; + this.trigger = BI.createWidget({ + type: 'bi.date_time_trigger' + }); + + this.trigger.on(BI.DateTrigger.EVENT_TRIGGER_CLICK, function () { + self.combo.toggle(); + }); + + this.popup = BI.createWidget({ + type: "bi.date_time_popup", + min: this.constants.DATE_MIN_VALUE, + max: this.constants.DATE_MAX_VALUE + }); + self.setValue(this.storeValue); + + this.popup.on(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () { + self.setValue(self.storeValue); + self.combo.hideView(); + self.fireEvent(BI.DateTimeCombo.EVENT_CANCEL); + }); + this.popup.on(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE, function () { + self.storeValue = self.popup.getValue(); + self.setValue(self.storeValue); + self.combo.hideView(); + self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM); + }); + this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () { + self.trigger.setValue(self.popup.getValue()); + }); + this.combo = BI.createWidget({ + type: 'bi.combo', + toggle: false, + isNeedAdjustHeight: false, + isNeedAdjustWidth: false, + el: this.trigger, + adjustLength: this.constants.comboAdjustHeight, + popup: { + el: this.popup, + maxHeight: this.constants.popupHeight, + width: this.constants.popupWidth, + stopPropagation: false + } + }); + this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { + self.popup.setValue(self.storeValue); + self.fireEvent(BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW); + }); + + var triggerBtn = BI.createWidget({ + type: "bi.trigger_icon_button", + cls: "chart-date-normal-font bi-border-left bi-border-top bi-border-bottom", + width: 30, + height: 25 + }); + triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { + if (self.combo.isViewVisible()) { + self.combo.hideView(); + } else { + self.combo.showView(); + } + }); + + BI.createWidget({ + type: "bi.htape", + element: this, + items: [{ + type: "bi.absolute", + items: [{ + el: this.combo, + top: 0, + left: 0, + right: 0, + bottom: 0 + }, { + el: triggerBtn, + top: 0, + left: 0 + }] + }] + }) + }, + + setValue: function (v) { + this.storeValue = v; + this.popup.setValue(v); + this.trigger.setValue(v); + }, + getValue: function () { + return { + value: this.storeValue, + text: this.trigger.getValue() + }; + } +}); + +BI.DateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; +BI.DateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.DateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; +BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW = "BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW"; +BI.shortcut('bi.date_time_combo', BI.DateTimeCombo); +/** + * Created by Urthur on 2017/7/14. + */ +BI.CustomDateTimeCombo = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.CustomDateTimeCombo.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-custom-date-time-combo" + }) + }, + + _init: function () { + BI.CustomDateTimeCombo.superclass._init.apply(this, arguments); + var self = this; + this.DateTime = BI.createWidget({ + type: "bi.date_time_combo", + element: this + }); + this.DateTime.on(BI.DateTimeCombo.EVENT_CANCEL, function () { + self.fireEvent(BI.CustomDateTimeCombo.EVENT_CANCEL); + }); + + this.DateTime.on(BI.DateTimeCombo.EVENT_CONFIRM, function () { + self.fireEvent(BI.CustomDateTimeCombo.EVENT_CONFIRM); + }); + }, + + getValue: function () { + return this.DateTime.getValue(); + }, + + setValue: function (v) { + this.DateTime.setValue(v); + } +}); +BI.CustomDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; +BI.CustomDateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; +BI.CustomDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.shortcut("bi.custom_date_time_combo", BI.CustomDateTimeCombo); +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimePopup = BI.inherit(BI.Widget, { + constants: { + + + triggerHeight: 24, + buttonWidth: 90, + buttonHeight: 25, + popupHeight: 290, + popupWidth: 270, + comboAdjustHeight: 1, + lgap: 2, + border: 1 + }, + _defaultConfig: function () { + return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { + baseCls: 'bi-date-time-popup', + width: 268, + height: 290 + }); + }, + _init: function () { + BI.DateTimePopup.superclass._init.apply(this, arguments); + var self = this; + this.cancelButton = BI.createWidget({ + type: 'bi.text_button', + forceCenter: true, + cls: 'bi-multidate-popup-button bi-border-top bi-border-right', + shadow: true, + text: BI.i18nText("BI-Basic_Cancel") + }); + this.cancelButton.on(BI.TextButton.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE); + }); + + this.okButton = BI.createWidget({ + type: "bi.text_button", + forceCenter: true, + cls: 'bi-multidate-popup-button bi-border-top', + shadow: true, + text: BI.i18nText("BI-Basic_OK") + }); + this.okButton.on(BI.TextButton.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE); + }); + + this.dateCombo = BI.createWidget({ + type: "bi.date_calendar_popup", + min: self.options.min, + max: self.options.max + }); + self.dateCombo.on(BI.DateCalendarPopup.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + + this.dateSelect = BI.createWidget({ + type: "bi.horizontal", + cls: "bi-border-top", + items: [{ + type: "bi.label", + text: BI.i18nText("BI-Basic_Time"), + width: 45 + },{ + type: "bi.date_time_select", + max: 23, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.hour = _ref; + self.hour.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + },{ + type: "bi.label", + text: ":", + width: 15 + },{ + type: "bi.date_time_select", + max: 59, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.minute = _ref; + self.minute.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + },{ + type: "bi.label", + text: ":", + width: 15 + },{ + type: "bi.date_time_select", + max: 59, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.second = _ref; + self.second.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + }] + }); + + this.dateButton = BI.createWidget({ + type: "bi.grid", + items: [[this.cancelButton, this.okButton]] + }); + BI.createWidget({ + element: this, + type: "bi.vtape", + items: [{ + el: this.dateCombo + }, { + el: this.dateSelect, + height: 50 + },{ + el: this.dateButton, + height: 30 + }] + }); + }, + + setValue: function (v) { + var value, date; + if (BI.isNotNull(v)) { + value = v.value; + if(BI.isNull(value)){ + date = new Date(); + this.dateCombo.setValue({ + year: date.getFullYear(), + month: date.getMonth(), + day: date.getDate() + }); + this.hour.setValue(date.getHours()); + this.minute.setValue(date.getMinutes()); + this.second.setValue(date.getSeconds()); + } else { + this.dateCombo.setValue({ + year: value.year, + month: value.month, + day: value.day + }); + this.hour.setValue(value.hour); + this.minute.setValue(value.minute); + this.second.setValue(value.second); + } + } + }, + + getValue: function () { + return { + value: { + year: this.dateCombo.getValue().year, + month: this.dateCombo.getValue().month, + day: this.dateCombo.getValue().day, + hour: this.hour.getValue(), + minute: this.minute.getValue(), + second: this.second.getValue() + } + } + } +}); +BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; +BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE = "BUTTON_CANCEL_EVENT_CHANGE"; +BI.DateTimePopup.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE"; +BI.shortcut('bi.date_time_popup', BI.DateTimePopup); + +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeSelect = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.DateTimeSelect.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-date-time-select bi-border", + max: 23, + min: 0 + }) + }, + + _init: function () { + BI.DateTimeSelect.superclass._init.apply(this, arguments); + var self = this, o = this.options; + this.editor = BI.createWidget({ + type: "bi.sign_editor", + value: this._alertInEditorValue(o.min), + errorText: BI.i18nText("BI-Please_Input_Natural_Number"), + validationChecker: function(v){ + return BI.isNaturalNumber(v); + } + }); + this.editor.on(BI.TextEditor.EVENT_CONFIRM, function(){ + self._finetuning(0); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this.topBtn = BI.createWidget({ + type: "bi.icon_button", + cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom" + }); + this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){ + self._finetuning(1); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this.bottomBtn = BI.createWidget({ + type: "bi.icon_button", + cls: "column-next-page-h-font bottom-button bi-border-left" + }); + this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){ + self._finetuning(-1); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this._finetuning(0); + BI.createWidget({ + type: "bi.htape", + element: this, + items: [this.editor, { + el: { + type: "bi.grid", + columns: 1, + rows: 2, + items: [{ + column: 0, + row: 0, + el: this.topBtn + }, { + column: 0, + row: 1, + el: this.bottomBtn + }] + }, + width: 30 + }] + }); + }, + + _alertOutEditorValue: function(v){ + if (v > this.options.max){ + v = this.options.min; + } + if (v < this.options.min){ + v = this.options.max + } + return BI.parseInt(v); + }, + + _alertInEditorValue: function(v){ + if (v > this.options.max){ + v = this.options.min; + } + if (v < this.options.min){ + v = this.options.max; + } + v = v < 10 ? "0" + v : v; + return v; + }, + + _finetuning: function(add){ + var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue())); + this.editor.setValue(this._alertInEditorValue(v + add)); + }, + + getValue: function () { + var v = this.editor.getValue(); + return this._alertOutEditorValue(v); + }, + + setValue: function (v) { + this.editor.setValue(this._alertInEditorValue(v)); + this._finetuning(0); + } + +}); +BI.DateTimeSelect.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.shortcut("bi.date_time_select", BI.DateTimeSelect); +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeTrigger = BI.inherit(BI.Trigger, { + _const: { + hgap: 4, + vgap: 2, + triggerWidth: 30 + }, + + _defaultConfig: function () { + return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), { + extraCls: "bi-date-time-trigger", + height: 25, + width: 180 + }); + }, + _init: function () { + BI.DateTimeTrigger.superclass._init.apply(this, arguments); + var self = this, o = this.options, c = this._const; + this.text = BI.createWidget({ + type: "bi.label", + cls: "bi-border", + textAlign: "left", + height: o.height, + width: o.width, + hgap: c.hgap, + vgap: c.vgap + }); + BI.createWidget({ + type: "bi.htape", + element: this, + items: [{ + el: BI.createWidget(), + width: 30 + }, { + el: this.text + }] + }) + }, + + _printTime: function (v) { + return v < 10 ? "0" + v : v; + }, + + setValue: function (v) { + var self = this; + if (BI.isNotNull(v)) { + var value = v.value, dateStr; + if(BI.isNull(value)){ + value = new Date(); + dateStr = value.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) + + " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds()); + } else { + dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day) + + " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second); + } + this.text.setText(dateStr); + this.text.setTitle(dateStr); + } + }, + getValue: function () { + return this.text.getText(); + } + +}); +BI.DateTrigger.EVENT_TRIGGER_CLICK = "EVENT_TRIGGER_CLICK"; +BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger); +/** * 带有方向的pathchooser * * Created by GUY on 2016/4/21. @@ -8120,6 +8639,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { self.trigger.getCounter().setButtonChecked(self.storeValue); }; this.storeValue = {}; + //标记正在请求数据 + this.requesting = false; this.trigger = BI.createWidget({ type: "bi.multi_select_trigger", @@ -8258,10 +8779,16 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { self.populate(); }); }); + //当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件 + this.wants2Quit = false; this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () { //important:关闭弹出时又可能没有退出编辑状态 self.trigger.stopEditing(); - self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + if (self.requesting === true) { + self.wants2Quit = true; + } else { + self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + } }); var triggerBtn = BI.createWidget({ @@ -8314,6 +8841,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { _joinKeywords: function (keywords, callback) { var self = this, o = this.options; this._assertValue(this.storeValue); + this.requesting = true; o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, keywords: keywords @@ -8336,6 +8864,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { _joinAll: function (res, callback) { var self = this, o = this.options; this._assertValue(res); + this.requesting = true; o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, keywords: [this.trigger.getKey()] @@ -8396,6 +8925,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { value: [] } } + if (self.wants2Quit === true) { + self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + self.wants2Quit = false; + } + self.requesting = false; } }, @@ -16019,7 +16553,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree function search(parents, current, result, searched) { var newParents = BI.clone(parents); newParents.push(current); - if (self._isMatch(current, keyword)) { + if (self._isMatch(parents, current, keyword)) { searched && searched.push(newParents); return true; } @@ -16048,7 +16582,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree function isSearchValueInParent(parentValues) { for (var i = 0, len = parentValues.length; i < len; i++) { - if (self._isMatch(parentValues[i], keyword)) { + if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { return true; } } @@ -16174,7 +16708,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree } function nodeSearch(deep, parentValues, current, isAllSelect, result) { - if (self._isMatch(current, keyword)) { + if (self._isMatch(parentValues, current, keyword)) { var checked = isAllSelect || isSelected(parentValues, current); createOneJson(parentValues, current, false, checked, !isAllSelect && isHalf(parentValues, current), true, result); return [true, checked]; @@ -16404,8 +16938,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree }); }, - _isMatch: function (value, keyword) { - var finded = BI.Func.getSearchResult([value], keyword); + _isMatch: function (parentValues, value, keyword) { + var node = this._getTreeNode(parentValues, value); + var finded = BI.Func.getSearchResult([node.text || node.value], keyword); return finded.finded.length > 0 || finded.matched.length > 0; }, diff --git a/demo/css/main.css b/demo/css/main.css index e8eb8e27b..c1f015137 100644 --- a/demo/css/main.css +++ b/demo/css/main.css @@ -51,3 +51,27 @@ body { .demo-clolor { color: #1a1a1a; } +.bi-progress-bar-processor { + transition: all 0.5s ease; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + background: #3f8ce8; + -webkit-border-radius: 20px; + -moz-border-radius: 20px; + border-radius: 20px; + overflow: hidden; + overflow-x: hidden; + overflow-y: hidden; +} +.bi-progress-text-bar-processor { + transition: all 0.5s ease; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; +} +.bi-progress-bar-bar { + -webkit-border-radius: 20px; + -moz-border-radius: 20px; + border-radius: 20px; +} diff --git a/demo/js/config/widget.js b/demo/js/config/widget.js index 0b880d7b5..fa15cb2fb 100644 --- a/demo/js/config/widget.js +++ b/demo/js/config/widget.js @@ -2,38 +2,6 @@ Demo.WIDGET_CONFIG = [{ id: 4, text: "详细控件", open: true - }, { - pId: 4, - id: 420, - text: '各种小控件', - }, { - pId: 420, - text: "各种通用按钮", - value: "demo.buttons" - }, { - pId: 420, - text: "各种提示性信息", - value: "demo.tips" - }, { - pId: 420, - text: "各种items", - value: "demo.items" - }, { - pId: 420, - text: "各种节点node", - value: "demo.nodes" - }, { - pId: 420, - text: "各种segment", - value: "demo.segments" - }, { - pId: 420, - text: "可以切换的树", - value: "demo.switch_tree" - }, { - pId: 1, - text: "bi.text_editor", - value: "text_editor" }, { id: 400, pId: 4, @@ -42,10 +10,6 @@ Demo.WIDGET_CONFIG = [{ pId: 400, text: "bi.multi_tree_combo", value: "demo.multi_tree_combo" - }, { - pId: 400, - text: "bi.switch_tree", - value: "demo.switch_tree" }, { id: 401, pId: 4, @@ -217,11 +181,15 @@ Demo.WIDGET_CONFIG = [{ pId: 412, text: "bi.year_month_combo", value: "demo.year_month_combo" - }, { + },{ pId: 412, text: "bi.year_quarter_combo", value: "demo.year_quarter_combo" - }, { + },{ + pId: 412, + text: "bi.custom_date_time", + value: "demo.custom_date_time" + },{ pId: 4, id: 413, text: "简单下拉树" @@ -285,13 +253,5 @@ Demo.WIDGET_CONFIG = [{ pId: 418, text: "bi.dialog", value: "demo.dialog" - }, { - pId: 4, - id: 419, - text: '文件管理', - }, { - pId: 419, - text: "bi.file_manager", - value: "demo.file_manager" - }, -]; \ No newline at end of file + } +]; diff --git a/demo/js/widget/demo.datetime.js b/demo/js/widget/demo.datetime.js new file mode 100644 index 000000000..e97046069 --- /dev/null +++ b/demo/js/widget/demo.datetime.js @@ -0,0 +1,30 @@ +/** + * Created by Urthur on 2017/7/18. + */ +Demo.CustomDateTime = BI.inherit(BI.Widget, { + props: { + }, + render: function () { + var self = this; + return { + type: "bi.absolute", + items: [{ + el: { + type: "bi.custom_date_time_combo", + ref: function (_ref) { + self.customDateTime = _ref; + self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CONFIRM, function () { + BI.Msg.alert("日期", this.getValue().text); + }); + self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CANCEL, function () { + BI.Msg.alert("日期", this.getValue().text); + }); + } + }, + top: 200, + left: 200 + }] + }; + } +}); +BI.shortcut("demo.custom_date_time", Demo.CustomDateTime); \ No newline at end of file diff --git a/demo/version.js b/demo/version.js index 0b0ad0f02..6b336ba16 100644 --- a/demo/version.js +++ b/demo/version.js @@ -8,5 +8,14 @@ BI.resourceURL = "resource/"; BI.i18n = { "BI-Basic_OK": "确定", "BI-Basic_Sure": "确定", - "BI-Basic_Clears": "清空" + "BI-Basic_Clears": "清空", + "BI-Basic_Cancel": "取消", + "BI-Basic_Time": "时间", + "BI-Basic_Simple_Sunday": "日", + "BI-Basic_Simple_Monday": "一", + "BI-Basic_Simple_Tuesday": "二", + "BI-Basic_Simple_Wednesday": "三", + "BI-Basic_Simple_Thursday": "四", + "BI-Basic_Simple_Friday": "五", + "BI-Basic_Simple_Saturday": "六", }; \ No newline at end of file diff --git a/docs/base.js b/docs/base.js index 21bf79c3d..97e6e385e 100644 --- a/docs/base.js +++ b/docs/base.js @@ -18489,6 +18489,9 @@ BI.Icon = BI.inherit(BI.Single, { }, _init: function () { BI.Icon.superclass._init.apply(this, arguments); + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } } }); BI.shortcut("bi.icon", BI.Icon);/** diff --git a/docs/core.css b/docs/core.css index 151794401..b09047d83 100644 --- a/docs/core.css +++ b/docs/core.css @@ -3900,7 +3900,7 @@ i { .bi-list-item-none:hover, .bi-list-item-none.hover { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-list-item-none:hover .bi-input, .bi-list-item-none.hover .bi-input { @@ -3913,7 +3913,7 @@ i { .bi-list-item-none:active, .bi-list-item-none.active { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-list-item-none:active .bi-input, .bi-list-item-none.active .bi-input { @@ -3951,7 +3951,7 @@ i { .bi-theme-dark .bi-list-item-none:hover, .bi-theme-dark .bi-list-item-none.hover { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-theme-dark .bi-list-item-none:hover .bi-input, .bi-theme-dark .bi-list-item-none.hover .bi-input { @@ -3964,7 +3964,7 @@ i { .bi-theme-dark .bi-list-item-none:active, .bi-theme-dark .bi-list-item-none.active { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-theme-dark .bi-list-item-none:active .bi-input, .bi-theme-dark .bi-list-item-none.active .bi-input { diff --git a/docs/demo.js b/docs/demo.js index b8f903954..f3b8012ec 100644 --- a/docs/demo.js +++ b/docs/demo.js @@ -8,7 +8,16 @@ BI.resourceURL = "resource/"; BI.i18n = { "BI-Basic_OK": "确定", "BI-Basic_Sure": "确定", - "BI-Basic_Clears": "清空" + "BI-Basic_Clears": "清空", + "BI-Basic_Cancel": "取消", + "BI-Basic_Time": "时间", + "BI-Basic_Simple_Sunday": "日", + "BI-Basic_Simple_Monday": "一", + "BI-Basic_Simple_Tuesday": "二", + "BI-Basic_Simple_Wednesday": "三", + "BI-Basic_Simple_Thursday": "四", + "BI-Basic_Simple_Friday": "五", + "BI-Basic_Simple_Saturday": "六", };$(function () { var ref; BI.createWidget({ @@ -3341,38 +3350,6 @@ Demo.COMPONENT_CONFIG = [{ id: 4, text: "详细控件", open: true - }, { - pId: 4, - id: 420, - text: '各种小控件', - }, { - pId: 420, - text: "各种通用按钮", - value: "demo.buttons" - }, { - pId: 420, - text: "各种提示性信息", - value: "demo.tips" - }, { - pId: 420, - text: "各种items", - value: "demo.items" - }, { - pId: 420, - text: "各种节点node", - value: "demo.nodes" - }, { - pId: 420, - text: "各种segment", - value: "demo.segments" - }, { - pId: 420, - text: "可以切换的树", - value: "demo.switch_tree" - }, { - pId: 1, - text: "bi.text_editor", - value: "text_editor" }, { id: 400, pId: 4, @@ -3381,10 +3358,6 @@ Demo.COMPONENT_CONFIG = [{ pId: 400, text: "bi.multi_tree_combo", value: "demo.multi_tree_combo" - }, { - pId: 400, - text: "bi.switch_tree", - value: "demo.switch_tree" }, { id: 401, pId: 4, @@ -3556,11 +3529,15 @@ Demo.COMPONENT_CONFIG = [{ pId: 412, text: "bi.year_month_combo", value: "demo.year_month_combo" - }, { + },{ pId: 412, text: "bi.year_quarter_combo", value: "demo.year_quarter_combo" - }, { + },{ + pId: 412, + text: "bi.custom_date_time", + value: "demo.custom_date_time" + },{ pId: 4, id: 413, text: "简单下拉树" @@ -3624,16 +3601,9 @@ Demo.COMPONENT_CONFIG = [{ pId: 418, text: "bi.dialog", value: "demo.dialog" - }, { - pId: 4, - id: 419, - text: '文件管理', - }, { - pId: 419, - text: "bi.file_manager", - value: "demo.file_manager" - }, -];Demo.Func = BI.inherit(BI.Widget, { + } +]; +Demo.Func = BI.inherit(BI.Widget, { props: { baseCls: "demo-func" }, @@ -7185,7 +7155,36 @@ BI.shortcut("demo.date", Demo.Date);Demo.DatePane = BI.inherit(BI.Widget, { } }) -BI.shortcut("demo.date_pane_widget", Demo.DatePane);Demo.DialogView = BI.inherit(BI.Widget, { +BI.shortcut("demo.date_pane_widget", Demo.DatePane);/** + * Created by Urthur on 2017/7/18. + */ +Demo.CustomDateTime = BI.inherit(BI.Widget, { + props: { + }, + render: function () { + var self = this; + return { + type: "bi.absolute", + items: [{ + el: { + type: "bi.custom_date_time_combo", + ref: function (_ref) { + self.customDateTime = _ref; + self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CONFIRM, function () { + BI.Msg.alert("日期", this.getValue().text); + }); + self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CANCEL, function () { + BI.Msg.alert("日期", this.getValue().text); + }); + } + }, + top: 200, + left: 200 + }] + }; + } +}); +BI.shortcut("demo.custom_date_time", Demo.CustomDateTime);Demo.DialogView = BI.inherit(BI.Widget, { render: function () { var items = [{ diff --git a/docs/resource.css b/docs/resource.css index dfc438363..2714b8af2 100644 --- a/docs/resource.css +++ b/docs/resource.css @@ -146,7 +146,7 @@ textarea::-webkit-scrollbar-thumb:hover { -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { content: "\e600"; @@ -158,7 +158,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { content: "\e600"; @@ -176,7 +176,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { content: "\e600"; @@ -199,7 +199,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-close-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { content: "\e600"; @@ -217,7 +217,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pre-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { content: "\e601"; @@ -235,7 +235,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .next-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { content: "\e602"; @@ -253,7 +253,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { content: "\e604"; @@ -265,7 +265,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .dot-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { content: "\e606"; @@ -277,7 +277,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #1a1a1a; } .dot-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { content: "\e606"; @@ -295,7 +295,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #1a1a1a; } .dot-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { content: "\e606"; @@ -318,7 +318,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .dot-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { content: "\e606"; @@ -344,7 +344,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { content: "\e607"; @@ -356,7 +356,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { content: "\e607"; @@ -374,7 +374,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { content: "\e607"; @@ -397,7 +397,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { content: "\e607"; @@ -423,7 +423,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { content: "\e610"; @@ -435,7 +435,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { content: "\e610"; @@ -453,7 +453,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #1a1a1a; } .copy-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { content: "\e610"; @@ -476,7 +476,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { content: "\e610"; @@ -502,7 +502,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { content: "\e611"; @@ -514,7 +514,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { content: "\e611"; @@ -532,7 +532,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { content: "\e611"; @@ -555,7 +555,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { content: "\e611"; @@ -582,7 +582,7 @@ textarea::-webkit-scrollbar-thumb:hover { } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .tree-node-triangle-expand-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .tree-node-triangle-expand-font .b-font:before { content: "\e608"; @@ -594,7 +594,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .tree-node-triangle-collapse-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .tree-node-triangle-collapse-font .b-font:before { content: "\e607"; @@ -606,7 +606,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .row-pre-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { content: "\e6be"; @@ -624,7 +624,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .row-next-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { content: "\e6bd"; @@ -642,7 +642,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-pre-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { content: "\e6bc"; @@ -660,7 +660,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-next-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { content: "\e6bb"; @@ -678,7 +678,7 @@ 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: "\e66a"; @@ -701,7 +701,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #999999; } .pull-down-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { content: "\e608"; @@ -713,7 +713,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e608"; @@ -731,7 +731,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e608"; @@ -754,7 +754,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { content: "\e611"; @@ -766,7 +766,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #3f8ce8; } .item-check-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { content: "\e611"; @@ -789,7 +789,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .primary-key-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';'); } .primary-key-font .b-font:before { content: "\e67d;"; @@ -807,7 +807,7 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .drag-tag-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { content: "\e600"; @@ -826,6 +826,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); _background: none; } +.tree-collapse-icon-type1 .x-icon.hack, +.tree-collapse-icon-type1:hover .x-icon.hack, +.tree-collapse-icon-type1:active .x-icon.hack { + background: url('icon/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); + _background: none; +} .tree-collapse-icon-type1.native .x-icon, .tree-collapse-icon-type1.disabled .x-icon { display: block; @@ -833,6 +840,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); _background: none; } +.tree-collapse-icon-type1.native .x-icon.hack, +.tree-collapse-icon-type1.disabled .x-icon.hack { + background: url('icon/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); + _background: none; +} .tree-collapse-icon-type2 .x-icon, .tree-collapse-icon-type2:hover .x-icon, .tree-collapse-icon-type2:active .x-icon { @@ -841,6 +854,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); _background: none; } +.tree-collapse-icon-type2 .x-icon.hack, +.tree-collapse-icon-type2:hover .x-icon.hack, +.tree-collapse-icon-type2:active .x-icon.hack { + background: url('icon/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); + _background: none; +} .tree-collapse-icon-type2.native .x-icon, .tree-collapse-icon-type2.disabled .x-icon { display: block; @@ -848,6 +868,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); _background: none; } +.tree-collapse-icon-type2.native .x-icon.hack, +.tree-collapse-icon-type2.disabled .x-icon.hack { + background: url('icon/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); + _background: none; +} .tree-collapse-icon-type3 .x-icon, .tree-collapse-icon-type3:hover .x-icon, .tree-collapse-icon-type3:active .x-icon { @@ -856,6 +882,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); _background: none; } +.tree-collapse-icon-type3 .x-icon.hack, +.tree-collapse-icon-type3:hover .x-icon.hack, +.tree-collapse-icon-type3:active .x-icon.hack { + background: url('icon/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); + _background: none; +} .tree-collapse-icon-type3.native .x-icon, .tree-collapse-icon-type3.disabled .x-icon { display: block; @@ -863,6 +896,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); _background: none; } +.tree-collapse-icon-type3.native .x-icon.hack, +.tree-collapse-icon-type3.disabled .x-icon.hack { + background: url('icon/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); + _background: none; +} .tree-collapse-icon-type4 .x-icon, .tree-collapse-icon-type4:hover .x-icon, .tree-collapse-icon-type4:active .x-icon { @@ -871,6 +910,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); _background: none; } +.tree-collapse-icon-type4 .x-icon.hack, +.tree-collapse-icon-type4:hover .x-icon.hack, +.tree-collapse-icon-type4:active .x-icon.hack { + background: url('icon/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); + _background: none; +} .tree-collapse-icon-type4.native .x-icon, .tree-collapse-icon-type4.disabled .x-icon { display: block; @@ -878,6 +924,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); _background: none; } +.tree-collapse-icon-type4.native .x-icon.hack, +.tree-collapse-icon-type4.disabled .x-icon.hack { + background: url('icon/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); + _background: none; +} .tree-expand-icon-type1 .x-icon, .tree-expand-icon-type1:hover .x-icon, .tree-expand-icon-type1:active .x-icon { @@ -886,6 +938,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); _background: none; } +.tree-expand-icon-type1 .x-icon.hack, +.tree-expand-icon-type1:hover .x-icon.hack, +.tree-expand-icon-type1:active .x-icon.hack { + background: url('icon/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); + _background: none; +} .tree-expand-icon-type1.native .x-icon, .tree-expand-icon-type1.disabled .x-icon { display: block; @@ -893,6 +952,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); _background: none; } +.tree-expand-icon-type1.native .x-icon.hack, +.tree-expand-icon-type1.disabled .x-icon.hack { + background: url('icon/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); + _background: none; +} .tree-expand-icon-type2 .x-icon, .tree-expand-icon-type2:hover .x-icon, .tree-expand-icon-type2:active .x-icon { @@ -901,6 +966,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); _background: none; } +.tree-expand-icon-type2 .x-icon.hack, +.tree-expand-icon-type2:hover .x-icon.hack, +.tree-expand-icon-type2:active .x-icon.hack { + background: url('icon/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); + _background: none; +} .tree-expand-icon-type2.native .x-icon, .tree-expand-icon-type2.disabled .x-icon { display: block; @@ -908,6 +980,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); _background: none; } +.tree-expand-icon-type2.native .x-icon.hack, +.tree-expand-icon-type2.disabled .x-icon.hack { + background: url('icon/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); + _background: none; +} .tree-expand-icon-type3 .x-icon, .tree-expand-icon-type3:hover .x-icon, .tree-expand-icon-type3:active .x-icon { @@ -916,6 +994,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); _background: none; } +.tree-expand-icon-type3 .x-icon.hack, +.tree-expand-icon-type3:hover .x-icon.hack, +.tree-expand-icon-type3:active .x-icon.hack { + background: url('icon/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); + _background: none; +} .tree-expand-icon-type3.native .x-icon, .tree-expand-icon-type3.disabled .x-icon { display: block; @@ -923,6 +1008,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); _background: none; } +.tree-expand-icon-type3.native .x-icon.hack, +.tree-expand-icon-type3.disabled .x-icon.hack { + background: url('icon/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); + _background: none; +} .tree-expand-icon-type4 .x-icon, .tree-expand-icon-type4:hover .x-icon, .tree-expand-icon-type4:active .x-icon { @@ -931,6 +1022,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); _background: none; } +.tree-expand-icon-type4 .x-icon.hack, +.tree-expand-icon-type4:hover .x-icon.hack, +.tree-expand-icon-type4:active .x-icon.hack { + background: url('icon/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); + _background: none; +} .tree-expand-icon-type4.native .x-icon, .tree-expand-icon-type4.disabled .x-icon { display: block; @@ -938,6 +1036,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); _background: none; } +.tree-expand-icon-type4.native .x-icon.hack, +.tree-expand-icon-type4.disabled .x-icon.hack { + background: url('icon/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); + _background: none; +} .tree-vertical-line-type2 .x-icon, .tree-vertical-line-type2:hover .x-icon, .tree-vertical-line-type2:active .x-icon { @@ -946,6 +1050,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); _background: none; } +.tree-vertical-line-type2 .x-icon.hack, +.tree-vertical-line-type2:hover .x-icon.hack, +.tree-vertical-line-type2:active .x-icon.hack { + background: url('icon/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); + _background: none; +} .tree-vertical-line-type2.native .x-icon, .tree-vertical-line-type2.disabled .x-icon { display: block; @@ -953,6 +1064,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); _background: none; } +.tree-vertical-line-type2.native .x-icon.hack, +.tree-vertical-line-type2.disabled .x-icon.hack { + background: url('icon/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); + _background: none; +} .tree-vertical-line-type3 .x-icon, .tree-vertical-line-type3:hover .x-icon, .tree-vertical-line-type3:active .x-icon { @@ -961,6 +1078,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); _background: none; } +.tree-vertical-line-type3 .x-icon.hack, +.tree-vertical-line-type3:hover .x-icon.hack, +.tree-vertical-line-type3:active .x-icon.hack { + background: url('icon/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); + _background: none; +} .tree-vertical-line-type3.native .x-icon, .tree-vertical-line-type3.disabled .x-icon { display: block; @@ -968,6 +1092,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); _background: none; } +.tree-vertical-line-type3.native .x-icon.hack, +.tree-vertical-line-type3.disabled .x-icon.hack { + background: url('icon/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); + _background: none; +} .tree-vertical-line-type4 .x-icon, .tree-vertical-line-type4:hover .x-icon, .tree-vertical-line-type4:active .x-icon { @@ -976,6 +1106,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); _background: none; } +.tree-vertical-line-type4 .x-icon.hack, +.tree-vertical-line-type4:hover .x-icon.hack, +.tree-vertical-line-type4:active .x-icon.hack { + background: url('icon/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); + _background: none; +} .tree-vertical-line-type4.native .x-icon, .tree-vertical-line-type4.disabled .x-icon { display: block; @@ -983,6 +1120,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); _background: none; } +.tree-vertical-line-type4.native .x-icon.hack, +.tree-vertical-line-type4.disabled .x-icon.hack { + background: url('icon/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type1 .x-icon, .bi-theme-dark .tree-collapse-icon-type1:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type1:active .x-icon { @@ -991,6 +1134,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type1 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type1:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type1:active .x-icon.hack { + background: url('icon/dark/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type1.native .x-icon, .bi-theme-dark .tree-collapse-icon-type1.disabled .x-icon { display: block; @@ -998,6 +1148,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type1.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type1.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type2 .x-icon, .bi-theme-dark .tree-collapse-icon-type2:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type2:active .x-icon { @@ -1006,6 +1162,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type2 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type2:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type2:active .x-icon.hack { + background: url('icon/dark/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type2.native .x-icon, .bi-theme-dark .tree-collapse-icon-type2.disabled .x-icon { display: block; @@ -1013,6 +1176,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type2.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type2.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type3 .x-icon, .bi-theme-dark .tree-collapse-icon-type3:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type3:active .x-icon { @@ -1021,6 +1190,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type3 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type3:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type3:active .x-icon.hack { + background: url('icon/dark/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type3.native .x-icon, .bi-theme-dark .tree-collapse-icon-type3.disabled .x-icon { display: block; @@ -1028,6 +1204,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type3.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type3.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type4 .x-icon, .bi-theme-dark .tree-collapse-icon-type4:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type4:active .x-icon { @@ -1036,6 +1218,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type4 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type4:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type4:active .x-icon.hack { + background: url('icon/dark/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type4.native .x-icon, .bi-theme-dark .tree-collapse-icon-type4.disabled .x-icon { display: block; @@ -1043,6 +1232,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type4.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type4.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type1 .x-icon, .bi-theme-dark .tree-expand-icon-type1:hover .x-icon, .bi-theme-dark .tree-expand-icon-type1:active .x-icon { @@ -1051,6 +1246,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type1 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type1:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type1:active .x-icon.hack { + background: url('icon/dark/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type1.native .x-icon, .bi-theme-dark .tree-expand-icon-type1.disabled .x-icon { display: block; @@ -1058,6 +1260,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type1.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type1.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type2 .x-icon, .bi-theme-dark .tree-expand-icon-type2:hover .x-icon, .bi-theme-dark .tree-expand-icon-type2:active .x-icon { @@ -1066,6 +1274,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type2 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type2:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type2:active .x-icon.hack { + background: url('icon/dark/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type2.native .x-icon, .bi-theme-dark .tree-expand-icon-type2.disabled .x-icon { display: block; @@ -1073,6 +1288,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type2.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type2.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type3 .x-icon, .bi-theme-dark .tree-expand-icon-type3:hover .x-icon, .bi-theme-dark .tree-expand-icon-type3:active .x-icon { @@ -1081,6 +1302,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type3 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type3:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type3:active .x-icon.hack { + background: url('icon/dark/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type3.native .x-icon, .bi-theme-dark .tree-expand-icon-type3.disabled .x-icon { display: block; @@ -1088,6 +1316,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type3.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type3.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type4 .x-icon, .bi-theme-dark .tree-expand-icon-type4:hover .x-icon, .bi-theme-dark .tree-expand-icon-type4:active .x-icon { @@ -1096,6 +1330,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type4 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type4:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type4:active .x-icon.hack { + background: url('icon/dark/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type4.native .x-icon, .bi-theme-dark .tree-expand-icon-type4.disabled .x-icon { display: block; @@ -1103,6 +1344,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type4.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type4.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type2 .x-icon, .bi-theme-dark .tree-vertical-line-type2:hover .x-icon, .bi-theme-dark .tree-vertical-line-type2:active .x-icon { @@ -1111,6 +1358,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type2 .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type2:hover .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type2:active .x-icon.hack { + background: url('icon/dark/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type2.native .x-icon, .bi-theme-dark .tree-vertical-line-type2.disabled .x-icon { display: block; @@ -1118,6 +1372,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type2.native .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type2.disabled .x-icon.hack { + background: url('icon/dark/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type3 .x-icon, .bi-theme-dark .tree-vertical-line-type3:hover .x-icon, .bi-theme-dark .tree-vertical-line-type3:active .x-icon { @@ -1126,6 +1386,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type3 .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type3:hover .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type3:active .x-icon.hack { + background: url('icon/dark/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type3.native .x-icon, .bi-theme-dark .tree-vertical-line-type3.disabled .x-icon { display: block; @@ -1133,6 +1400,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type3.native .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type3.disabled .x-icon.hack { + background: url('icon/dark/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type4 .x-icon, .bi-theme-dark .tree-vertical-line-type4:hover .x-icon, .bi-theme-dark .tree-vertical-line-type4:active .x-icon { @@ -1141,6 +1414,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type4 .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type4:hover .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type4:active .x-icon.hack { + background: url('icon/dark/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type4.native .x-icon, .bi-theme-dark .tree-vertical-line-type4.disabled .x-icon { display: block; @@ -1148,12 +1428,23 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type4.native .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type4.disabled .x-icon.hack { + background: url('icon/dark/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); + _background: none; +} .check-box-icon .x-icon { display: block; background: url('icon/check-box-normal.png') no-repeat 0 0; _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); _background: none; } +.check-box-icon .x-icon.hack { + background: url('icon/check-box-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); + _background: none; +} .check-box-icon:hover .x-icon, .check-box-icon:focus .x-icon, .check-box-icon.hover .x-icon { @@ -1162,6 +1453,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); _background: none; } +.check-box-icon:hover .x-icon.hack, +.check-box-icon:focus .x-icon.hack, +.check-box-icon.hover .x-icon.hack { + background: url('icon/check-box-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); + _background: none; +} .check-box-icon:active .x-icon, .check-box-icon.active .x-icon { display: block; @@ -1169,6 +1467,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-active.png'); _background: none; } +.check-box-icon:active .x-icon.hack, +.check-box-icon.active .x-icon.hack { + background: url('icon/check-box-active.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-active.png'); + _background: none; +} .check-box-icon.native .x-icon, .check-box-icon.disabled .x-icon { display: block; @@ -1176,6 +1480,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable.png'); _background: none; } +.check-box-icon.native .x-icon.hack, +.check-box-icon.disabled .x-icon.hack { + background: url('icon/check-box-disable.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable.png'); + _background: none; +} .check-box-icon.native .x-icon, .check-box-icon.disabled.active .x-icon { display: block; @@ -1183,12 +1493,23 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable2.png'); _background: none; } +.check-box-icon.native .x-icon.hack, +.check-box-icon.disabled.active .x-icon.hack { + background: url('icon/check-box-disable2.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable2.png'); + _background: none; +} .radio-icon .x-icon { display: block; background: url('icon/radio-normal.png') no-repeat 0 0; _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); _background: none; } +.radio-icon .x-icon.hack { + background: url('icon/radio-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); + _background: none; +} .radio-icon:hover .x-icon, .radio-icon:focus .x-icon, .radio-icon.hover .x-icon { @@ -1197,6 +1518,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); _background: none; } +.radio-icon:hover .x-icon.hack, +.radio-icon:focus .x-icon.hack, +.radio-icon.hover .x-icon.hack { + background: url('icon/radio-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); + _background: none; +} .radio-icon:active .x-icon, .radio-icon.active .x-icon { display: block; @@ -1204,6 +1532,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-active.png'); _background: none; } +.radio-icon:active .x-icon.hack, +.radio-icon.active .x-icon.hack { + background: url('icon/radio-active.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-active.png'); + _background: none; +} .radio-icon.native .x-icon, .radio-icon.disabled .x-icon { display: block; @@ -1211,6 +1545,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable.png'); _background: none; } +.radio-icon.native .x-icon.hack, +.radio-icon.disabled .x-icon.hack { + background: url('icon/radio-disable.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable.png'); + _background: none; +} .radio-icon.native .x-icon, .radio-icon.disabled.active .x-icon { display: block; @@ -1218,6 +1558,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable2.png'); _background: none; } +.radio-icon.native .x-icon.hack, +.radio-icon.disabled.active .x-icon.hack { + background: url('icon/radio-disable2.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable2.png'); + _background: none; +} .check-half-select-icon .x-icon, .check-half-select-icon:hover .x-icon, .check-half-select-icon:active .x-icon { @@ -1226,6 +1572,13 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); _background: none; } +.check-half-select-icon .x-icon.hack, +.check-half-select-icon:hover .x-icon.hack, +.check-half-select-icon:active .x-icon.hack { + background: url('icon/half_selected.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); + _background: none; +} .check-half-select-icon.native .x-icon, .check-half-select-icon.disabled .x-icon { display: block; @@ -1233,6 +1586,12 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); _background: none; } +.check-half-select-icon.native .x-icon.hack, +.check-half-select-icon.disabled .x-icon.hack { + background: url('icon/half_selected.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); + _background: none; +} /** * Farbtastic Color Picker 1.2 * © 2008 Steven Wittens diff --git a/docs/widget.js b/docs/widget.js index 5580c64d8..506e61409 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -3866,6 +3866,525 @@ BI.DatePaneWidget = BI.inherit(BI.Widget, { }); BI.shortcut("bi.date_pane_widget", BI.DatePaneWidget);/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeCombo = BI.inherit(BI.Single, { + constants: { + popupHeight: 290, + popupWidth: 270, + comboAdjustHeight: 1, + border: 1, + DATE_MIN_VALUE: "1900-01-01", + DATE_MAX_VALUE: "2099-12-31" + }, + _defaultConfig: function () { + return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), { + baseCls: 'bi-date-time-combo', + height: 24 + }); + }, + _init: function () { + BI.DateTimeCombo.superclass._init.apply(this, arguments); + var self = this; + var date = new Date(); + this.storeValue = { + value: { + year: date.getFullYear(), + month: date.getMonth(), + day: date.getDate(), + hour: date.getHours(), + minute: date.getMinutes(), + second: date.getSeconds() + } + }; + this.trigger = BI.createWidget({ + type: 'bi.date_time_trigger' + }); + + this.trigger.on(BI.DateTrigger.EVENT_TRIGGER_CLICK, function () { + self.combo.toggle(); + }); + + this.popup = BI.createWidget({ + type: "bi.date_time_popup", + min: this.constants.DATE_MIN_VALUE, + max: this.constants.DATE_MAX_VALUE + }); + self.setValue(this.storeValue); + + this.popup.on(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () { + self.setValue(self.storeValue); + self.combo.hideView(); + self.fireEvent(BI.DateTimeCombo.EVENT_CANCEL); + }); + this.popup.on(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE, function () { + self.storeValue = self.popup.getValue(); + self.setValue(self.storeValue); + self.combo.hideView(); + self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM); + }); + this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () { + self.trigger.setValue(self.popup.getValue()); + }); + this.combo = BI.createWidget({ + type: 'bi.combo', + toggle: false, + isNeedAdjustHeight: false, + isNeedAdjustWidth: false, + el: this.trigger, + adjustLength: this.constants.comboAdjustHeight, + popup: { + el: this.popup, + maxHeight: this.constants.popupHeight, + width: this.constants.popupWidth, + stopPropagation: false + } + }); + this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { + self.popup.setValue(self.storeValue); + self.fireEvent(BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW); + }); + + var triggerBtn = BI.createWidget({ + type: "bi.trigger_icon_button", + cls: "chart-date-normal-font bi-border-left bi-border-top bi-border-bottom", + width: 30, + height: 25 + }); + triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { + if (self.combo.isViewVisible()) { + self.combo.hideView(); + } else { + self.combo.showView(); + } + }); + + BI.createWidget({ + type: "bi.htape", + element: this, + items: [{ + type: "bi.absolute", + items: [{ + el: this.combo, + top: 0, + left: 0, + right: 0, + bottom: 0 + }, { + el: triggerBtn, + top: 0, + left: 0 + }] + }] + }) + }, + + setValue: function (v) { + this.storeValue = v; + this.popup.setValue(v); + this.trigger.setValue(v); + }, + getValue: function () { + return { + value: this.storeValue, + text: this.trigger.getValue() + }; + } +}); + +BI.DateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; +BI.DateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.DateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; +BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW = "BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW"; +BI.shortcut('bi.date_time_combo', BI.DateTimeCombo); +/** + * Created by Urthur on 2017/7/14. + */ +BI.CustomDateTimeCombo = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.CustomDateTimeCombo.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-custom-date-time-combo" + }) + }, + + _init: function () { + BI.CustomDateTimeCombo.superclass._init.apply(this, arguments); + var self = this; + this.DateTime = BI.createWidget({ + type: "bi.date_time_combo", + element: this + }); + this.DateTime.on(BI.DateTimeCombo.EVENT_CANCEL, function () { + self.fireEvent(BI.CustomDateTimeCombo.EVENT_CANCEL); + }); + + this.DateTime.on(BI.DateTimeCombo.EVENT_CONFIRM, function () { + self.fireEvent(BI.CustomDateTimeCombo.EVENT_CONFIRM); + }); + }, + + getValue: function () { + return this.DateTime.getValue(); + }, + + setValue: function (v) { + this.DateTime.setValue(v); + } +}); +BI.CustomDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; +BI.CustomDateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; +BI.CustomDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.shortcut("bi.custom_date_time_combo", BI.CustomDateTimeCombo); +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimePopup = BI.inherit(BI.Widget, { + constants: { + + + triggerHeight: 24, + buttonWidth: 90, + buttonHeight: 25, + popupHeight: 290, + popupWidth: 270, + comboAdjustHeight: 1, + lgap: 2, + border: 1 + }, + _defaultConfig: function () { + return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { + baseCls: 'bi-date-time-popup', + width: 268, + height: 290 + }); + }, + _init: function () { + BI.DateTimePopup.superclass._init.apply(this, arguments); + var self = this; + this.cancelButton = BI.createWidget({ + type: 'bi.text_button', + forceCenter: true, + cls: 'bi-multidate-popup-button bi-border-top bi-border-right', + shadow: true, + text: BI.i18nText("BI-Basic_Cancel") + }); + this.cancelButton.on(BI.TextButton.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE); + }); + + this.okButton = BI.createWidget({ + type: "bi.text_button", + forceCenter: true, + cls: 'bi-multidate-popup-button bi-border-top', + shadow: true, + text: BI.i18nText("BI-Basic_OK") + }); + this.okButton.on(BI.TextButton.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE); + }); + + this.dateCombo = BI.createWidget({ + type: "bi.date_calendar_popup", + min: self.options.min, + max: self.options.max + }); + self.dateCombo.on(BI.DateCalendarPopup.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + + this.dateSelect = BI.createWidget({ + type: "bi.horizontal", + cls: "bi-border-top", + items: [{ + type: "bi.label", + text: BI.i18nText("BI-Basic_Time"), + width: 45 + },{ + type: "bi.date_time_select", + max: 23, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.hour = _ref; + self.hour.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + },{ + type: "bi.label", + text: ":", + width: 15 + },{ + type: "bi.date_time_select", + max: 59, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.minute = _ref; + self.minute.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + },{ + type: "bi.label", + text: ":", + width: 15 + },{ + type: "bi.date_time_select", + max: 59, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.second = _ref; + self.second.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + }] + }); + + this.dateButton = BI.createWidget({ + type: "bi.grid", + items: [[this.cancelButton, this.okButton]] + }); + BI.createWidget({ + element: this, + type: "bi.vtape", + items: [{ + el: this.dateCombo + }, { + el: this.dateSelect, + height: 50 + },{ + el: this.dateButton, + height: 30 + }] + }); + }, + + setValue: function (v) { + var value, date; + if (BI.isNotNull(v)) { + value = v.value; + if(BI.isNull(value)){ + date = new Date(); + this.dateCombo.setValue({ + year: date.getFullYear(), + month: date.getMonth(), + day: date.getDate() + }); + this.hour.setValue(date.getHours()); + this.minute.setValue(date.getMinutes()); + this.second.setValue(date.getSeconds()); + } else { + this.dateCombo.setValue({ + year: value.year, + month: value.month, + day: value.day + }); + this.hour.setValue(value.hour); + this.minute.setValue(value.minute); + this.second.setValue(value.second); + } + } + }, + + getValue: function () { + return { + value: { + year: this.dateCombo.getValue().year, + month: this.dateCombo.getValue().month, + day: this.dateCombo.getValue().day, + hour: this.hour.getValue(), + minute: this.minute.getValue(), + second: this.second.getValue() + } + } + } +}); +BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; +BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE = "BUTTON_CANCEL_EVENT_CHANGE"; +BI.DateTimePopup.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE"; +BI.shortcut('bi.date_time_popup', BI.DateTimePopup); + +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeSelect = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.DateTimeSelect.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-date-time-select bi-border", + max: 23, + min: 0 + }) + }, + + _init: function () { + BI.DateTimeSelect.superclass._init.apply(this, arguments); + var self = this, o = this.options; + this.editor = BI.createWidget({ + type: "bi.sign_editor", + value: this._alertInEditorValue(o.min), + errorText: BI.i18nText("BI-Please_Input_Natural_Number"), + validationChecker: function(v){ + return BI.isNaturalNumber(v); + } + }); + this.editor.on(BI.TextEditor.EVENT_CONFIRM, function(){ + self._finetuning(0); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this.topBtn = BI.createWidget({ + type: "bi.icon_button", + cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom" + }); + this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){ + self._finetuning(1); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this.bottomBtn = BI.createWidget({ + type: "bi.icon_button", + cls: "column-next-page-h-font bottom-button bi-border-left" + }); + this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){ + self._finetuning(-1); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this._finetuning(0); + BI.createWidget({ + type: "bi.htape", + element: this, + items: [this.editor, { + el: { + type: "bi.grid", + columns: 1, + rows: 2, + items: [{ + column: 0, + row: 0, + el: this.topBtn + }, { + column: 0, + row: 1, + el: this.bottomBtn + }] + }, + width: 30 + }] + }); + }, + + _alertOutEditorValue: function(v){ + if (v > this.options.max){ + v = this.options.min; + } + if (v < this.options.min){ + v = this.options.max + } + return BI.parseInt(v); + }, + + _alertInEditorValue: function(v){ + if (v > this.options.max){ + v = this.options.min; + } + if (v < this.options.min){ + v = this.options.max; + } + v = v < 10 ? "0" + v : v; + return v; + }, + + _finetuning: function(add){ + var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue())); + this.editor.setValue(this._alertInEditorValue(v + add)); + }, + + getValue: function () { + var v = this.editor.getValue(); + return this._alertOutEditorValue(v); + }, + + setValue: function (v) { + this.editor.setValue(this._alertInEditorValue(v)); + this._finetuning(0); + } + +}); +BI.DateTimeSelect.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.shortcut("bi.date_time_select", BI.DateTimeSelect); +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeTrigger = BI.inherit(BI.Trigger, { + _const: { + hgap: 4, + vgap: 2, + triggerWidth: 30 + }, + + _defaultConfig: function () { + return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), { + extraCls: "bi-date-time-trigger", + height: 25, + width: 180 + }); + }, + _init: function () { + BI.DateTimeTrigger.superclass._init.apply(this, arguments); + var self = this, o = this.options, c = this._const; + this.text = BI.createWidget({ + type: "bi.label", + cls: "bi-border", + textAlign: "left", + height: o.height, + width: o.width, + hgap: c.hgap, + vgap: c.vgap + }); + BI.createWidget({ + type: "bi.htape", + element: this, + items: [{ + el: BI.createWidget(), + width: 30 + }, { + el: this.text + }] + }) + }, + + _printTime: function (v) { + return v < 10 ? "0" + v : v; + }, + + setValue: function (v) { + var self = this; + if (BI.isNotNull(v)) { + var value = v.value, dateStr; + if(BI.isNull(value)){ + value = new Date(); + dateStr = value.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) + + " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds()); + } else { + dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day) + + " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second); + } + this.text.setText(dateStr); + this.text.setTitle(dateStr); + } + }, + getValue: function () { + return this.text.getText(); + } + +}); +BI.DateTrigger.EVENT_TRIGGER_CLICK = "EVENT_TRIGGER_CLICK"; +BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger); +/** * 带有方向的pathchooser * * Created by GUY on 2016/4/21. @@ -8120,6 +8639,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { self.trigger.getCounter().setButtonChecked(self.storeValue); }; this.storeValue = {}; + //标记正在请求数据 + this.requesting = false; this.trigger = BI.createWidget({ type: "bi.multi_select_trigger", @@ -8258,10 +8779,16 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { self.populate(); }); }); + //当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件 + this.wants2Quit = false; this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () { //important:关闭弹出时又可能没有退出编辑状态 self.trigger.stopEditing(); - self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + if (self.requesting === true) { + self.wants2Quit = true; + } else { + self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + } }); var triggerBtn = BI.createWidget({ @@ -8314,6 +8841,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { _joinKeywords: function (keywords, callback) { var self = this, o = this.options; this._assertValue(this.storeValue); + this.requesting = true; o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, keywords: keywords @@ -8336,6 +8864,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { _joinAll: function (res, callback) { var self = this, o = this.options; this._assertValue(res); + this.requesting = true; o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, keywords: [this.trigger.getKey()] @@ -8396,6 +8925,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { value: [] } } + if (self.wants2Quit === true) { + self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + self.wants2Quit = false; + } + self.requesting = false; } }, @@ -16019,7 +16553,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree function search(parents, current, result, searched) { var newParents = BI.clone(parents); newParents.push(current); - if (self._isMatch(current, keyword)) { + if (self._isMatch(parents, current, keyword)) { searched && searched.push(newParents); return true; } @@ -16048,7 +16582,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree function isSearchValueInParent(parentValues) { for (var i = 0, len = parentValues.length; i < len; i++) { - if (self._isMatch(parentValues[i], keyword)) { + if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { return true; } } @@ -16174,7 +16708,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree } function nodeSearch(deep, parentValues, current, isAllSelect, result) { - if (self._isMatch(current, keyword)) { + if (self._isMatch(parentValues, current, keyword)) { var checked = isAllSelect || isSelected(parentValues, current); createOneJson(parentValues, current, false, checked, !isAllSelect && isHalf(parentValues, current), true, result); return [true, checked]; @@ -16404,8 +16938,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree }); }, - _isMatch: function (value, keyword) { - var finded = BI.Func.getSearchResult([value], keyword); + _isMatch: function (parentValues, value, keyword) { + var node = this._getTreeNode(parentValues, value); + var finded = BI.Func.getSearchResult([node.text || node.value], keyword); return finded.finded.length > 0 || finded.matched.length > 0; }, diff --git a/src/base/single/icon/icon.js b/src/base/single/icon/icon.js index 58810343c..51804c51c 100644 --- a/src/base/single/icon/icon.js +++ b/src/base/single/icon/icon.js @@ -13,6 +13,9 @@ BI.Icon = BI.inherit(BI.Single, { }, _init: function () { BI.Icon.superclass._init.apply(this, arguments); + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } } }); BI.shortcut("bi.icon", BI.Icon); \ No newline at end of file diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js index 1d929f65e..d881febe3 100644 --- a/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -227,7 +227,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { function search(parents, current, result, searched) { var newParents = BI.clone(parents); newParents.push(current); - if (self._isMatch(current, keyword)) { + if (self._isMatch(parents, current, keyword)) { searched && searched.push(newParents); return true; } @@ -256,7 +256,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { function isSearchValueInParent(parentValues) { for (var i = 0, len = parentValues.length; i < len; i++) { - if (self._isMatch(parentValues[i], keyword)) { + if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { return true; } } @@ -382,7 +382,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { } function nodeSearch(deep, parentValues, current, isAllSelect, result) { - if (self._isMatch(current, keyword)) { + if (self._isMatch(parentValues, current, keyword)) { var checked = isAllSelect || isSelected(parentValues, current); createOneJson(parentValues, current, false, checked, !isAllSelect && isHalf(parentValues, current), true, result); return [true, checked]; @@ -612,8 +612,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { }); }, - _isMatch: function (value, keyword) { - var finded = BI.Func.getSearchResult([value], keyword); + _isMatch: function (parentValues, value, keyword) { + var node = this._getTreeNode(parentValues, value); + var finded = BI.Func.getSearchResult([node.text || node.value], keyword); return finded.finded.length > 0 || finded.matched.length > 0; }, diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index f362b482d..a4ff12fef 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -724,7 +724,7 @@ .bi-list-item-none:hover, .bi-list-item-none.hover { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-list-item-none:hover .bi-input, .bi-list-item-none.hover .bi-input { @@ -737,7 +737,7 @@ .bi-list-item-none:active, .bi-list-item-none.active { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-list-item-none:active .bi-input, .bi-list-item-none.active .bi-input { @@ -775,7 +775,7 @@ .bi-theme-dark .bi-list-item-none:hover, .bi-theme-dark .bi-list-item-none.hover { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-theme-dark .bi-list-item-none:hover .bi-input, .bi-theme-dark .bi-list-item-none.hover .bi-input { @@ -788,7 +788,7 @@ .bi-theme-dark .bi-list-item-none:active, .bi-theme-dark .bi-list-item-none.active { color: inherit; - background-color: inherit; + background-color: transparent; } .bi-theme-dark .bi-list-item-none:active .bi-input, .bi-theme-dark .bi-list-item-none.active .bi-input { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index ee9d61c35..e8a99d5f1 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -12,7 +12,7 @@ -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { content: "\e600"; @@ -24,7 +24,7 @@ color: inherit; } .close-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { content: "\e600"; @@ -42,7 +42,7 @@ color: inherit; } .close-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { content: "\e600"; @@ -65,7 +65,7 @@ color: inherit; } .search-close-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { content: "\e600"; @@ -83,7 +83,7 @@ color: inherit; } .pre-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { content: "\e601"; @@ -101,7 +101,7 @@ color: inherit; } .next-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { content: "\e602"; @@ -119,7 +119,7 @@ color: inherit; } .search-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { content: "\e604"; @@ -131,7 +131,7 @@ color: inherit; } .dot-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { content: "\e606"; @@ -143,7 +143,7 @@ color: #1a1a1a; } .dot-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { content: "\e606"; @@ -161,7 +161,7 @@ color: #1a1a1a; } .dot-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { content: "\e606"; @@ -184,7 +184,7 @@ color: #ffffff; } .dot-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { content: "\e606"; @@ -210,7 +210,7 @@ color: #ffffff; } .pull-right-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { content: "\e607"; @@ -222,7 +222,7 @@ color: inherit; } .pull-right-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { content: "\e607"; @@ -240,7 +240,7 @@ color: inherit; } .pull-right-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { content: "\e607"; @@ -263,7 +263,7 @@ color: inherit; } .pull-right-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { content: "\e607"; @@ -289,7 +289,7 @@ color: inherit; } .copy-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { content: "\e610"; @@ -301,7 +301,7 @@ color: inherit; } .copy-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { content: "\e610"; @@ -319,7 +319,7 @@ color: #1a1a1a; } .copy-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { content: "\e610"; @@ -342,7 +342,7 @@ color: inherit; } .copy-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { content: "\e610"; @@ -368,7 +368,7 @@ color: inherit; } .check-mark-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { content: "\e611"; @@ -380,7 +380,7 @@ color: inherit; } .check-mark-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { content: "\e611"; @@ -398,7 +398,7 @@ color: inherit; } .check-mark-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { content: "\e611"; @@ -421,7 +421,7 @@ color: inherit; } .check-mark-e-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { content: "\e611"; @@ -448,7 +448,7 @@ } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .tree-node-triangle-expand-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .tree-node-triangle-expand-font .b-font:before { content: "\e608"; @@ -460,7 +460,7 @@ color: inherit; } .tree-node-triangle-collapse-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .tree-node-triangle-collapse-font .b-font:before { content: "\e607"; @@ -472,7 +472,7 @@ color: inherit; } .row-pre-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { content: "\e6be"; @@ -490,7 +490,7 @@ color: inherit; } .row-next-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { content: "\e6bd"; @@ -508,7 +508,7 @@ color: inherit; } .column-pre-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { content: "\e6bc"; @@ -526,7 +526,7 @@ color: inherit; } .column-next-page-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { content: "\e6bb"; @@ -544,7 +544,7 @@ color: inherit; } .trigger-triangle-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { content: "\e66a"; @@ -567,7 +567,7 @@ color: #999999; } .pull-down-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { content: "\e608"; @@ -579,7 +579,7 @@ color: inherit; } .pull-down-h-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e608"; @@ -597,7 +597,7 @@ color: inherit; } .pull-down-ha-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e608"; @@ -620,7 +620,7 @@ color: inherit; } .check-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { content: "\e611"; @@ -632,7 +632,7 @@ color: #3f8ce8; } .item-check-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { content: "\e611"; @@ -655,7 +655,7 @@ color: #ffffff; } .primary-key-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';'); } .primary-key-font .b-font:before { content: "\e67d;"; @@ -673,7 +673,7 @@ color: inherit; } .drag-tag-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { content: "\e600"; diff --git a/src/css/resource/icon.css b/src/css/resource/icon.css index 0118afa4c..dafa8035e 100644 --- a/src/css/resource/icon.css +++ b/src/css/resource/icon.css @@ -6,6 +6,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); _background: none; } +.tree-collapse-icon-type1 .x-icon.hack, +.tree-collapse-icon-type1:hover .x-icon.hack, +.tree-collapse-icon-type1:active .x-icon.hack { + background: url('icon/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); + _background: none; +} .tree-collapse-icon-type1.native .x-icon, .tree-collapse-icon-type1.disabled .x-icon { display: block; @@ -13,6 +20,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); _background: none; } +.tree-collapse-icon-type1.native .x-icon.hack, +.tree-collapse-icon-type1.disabled .x-icon.hack { + background: url('icon/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-1.png'); + _background: none; +} .tree-collapse-icon-type2 .x-icon, .tree-collapse-icon-type2:hover .x-icon, .tree-collapse-icon-type2:active .x-icon { @@ -21,6 +34,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); _background: none; } +.tree-collapse-icon-type2 .x-icon.hack, +.tree-collapse-icon-type2:hover .x-icon.hack, +.tree-collapse-icon-type2:active .x-icon.hack { + background: url('icon/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); + _background: none; +} .tree-collapse-icon-type2.native .x-icon, .tree-collapse-icon-type2.disabled .x-icon { display: block; @@ -28,6 +48,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); _background: none; } +.tree-collapse-icon-type2.native .x-icon.hack, +.tree-collapse-icon-type2.disabled .x-icon.hack { + background: url('icon/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-2.png'); + _background: none; +} .tree-collapse-icon-type3 .x-icon, .tree-collapse-icon-type3:hover .x-icon, .tree-collapse-icon-type3:active .x-icon { @@ -36,6 +62,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); _background: none; } +.tree-collapse-icon-type3 .x-icon.hack, +.tree-collapse-icon-type3:hover .x-icon.hack, +.tree-collapse-icon-type3:active .x-icon.hack { + background: url('icon/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); + _background: none; +} .tree-collapse-icon-type3.native .x-icon, .tree-collapse-icon-type3.disabled .x-icon { display: block; @@ -43,6 +76,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); _background: none; } +.tree-collapse-icon-type3.native .x-icon.hack, +.tree-collapse-icon-type3.disabled .x-icon.hack { + background: url('icon/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-3.png'); + _background: none; +} .tree-collapse-icon-type4 .x-icon, .tree-collapse-icon-type4:hover .x-icon, .tree-collapse-icon-type4:active .x-icon { @@ -51,6 +90,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); _background: none; } +.tree-collapse-icon-type4 .x-icon.hack, +.tree-collapse-icon-type4:hover .x-icon.hack, +.tree-collapse-icon-type4:active .x-icon.hack { + background: url('icon/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); + _background: none; +} .tree-collapse-icon-type4.native .x-icon, .tree-collapse-icon-type4.disabled .x-icon { display: block; @@ -58,6 +104,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); _background: none; } +.tree-collapse-icon-type4.native .x-icon.hack, +.tree-collapse-icon-type4.disabled .x-icon.hack { + background: url('icon/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-collapse-4.png'); + _background: none; +} .tree-expand-icon-type1 .x-icon, .tree-expand-icon-type1:hover .x-icon, .tree-expand-icon-type1:active .x-icon { @@ -66,6 +118,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); _background: none; } +.tree-expand-icon-type1 .x-icon.hack, +.tree-expand-icon-type1:hover .x-icon.hack, +.tree-expand-icon-type1:active .x-icon.hack { + background: url('icon/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); + _background: none; +} .tree-expand-icon-type1.native .x-icon, .tree-expand-icon-type1.disabled .x-icon { display: block; @@ -73,6 +132,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); _background: none; } +.tree-expand-icon-type1.native .x-icon.hack, +.tree-expand-icon-type1.disabled .x-icon.hack { + background: url('icon/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-1.png'); + _background: none; +} .tree-expand-icon-type2 .x-icon, .tree-expand-icon-type2:hover .x-icon, .tree-expand-icon-type2:active .x-icon { @@ -81,6 +146,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); _background: none; } +.tree-expand-icon-type2 .x-icon.hack, +.tree-expand-icon-type2:hover .x-icon.hack, +.tree-expand-icon-type2:active .x-icon.hack { + background: url('icon/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); + _background: none; +} .tree-expand-icon-type2.native .x-icon, .tree-expand-icon-type2.disabled .x-icon { display: block; @@ -88,6 +160,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); _background: none; } +.tree-expand-icon-type2.native .x-icon.hack, +.tree-expand-icon-type2.disabled .x-icon.hack { + background: url('icon/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-2.png'); + _background: none; +} .tree-expand-icon-type3 .x-icon, .tree-expand-icon-type3:hover .x-icon, .tree-expand-icon-type3:active .x-icon { @@ -96,6 +174,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); _background: none; } +.tree-expand-icon-type3 .x-icon.hack, +.tree-expand-icon-type3:hover .x-icon.hack, +.tree-expand-icon-type3:active .x-icon.hack { + background: url('icon/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); + _background: none; +} .tree-expand-icon-type3.native .x-icon, .tree-expand-icon-type3.disabled .x-icon { display: block; @@ -103,6 +188,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); _background: none; } +.tree-expand-icon-type3.native .x-icon.hack, +.tree-expand-icon-type3.disabled .x-icon.hack { + background: url('icon/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-3.png'); + _background: none; +} .tree-expand-icon-type4 .x-icon, .tree-expand-icon-type4:hover .x-icon, .tree-expand-icon-type4:active .x-icon { @@ -111,6 +202,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); _background: none; } +.tree-expand-icon-type4 .x-icon.hack, +.tree-expand-icon-type4:hover .x-icon.hack, +.tree-expand-icon-type4:active .x-icon.hack { + background: url('icon/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); + _background: none; +} .tree-expand-icon-type4.native .x-icon, .tree-expand-icon-type4.disabled .x-icon { display: block; @@ -118,6 +216,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); _background: none; } +.tree-expand-icon-type4.native .x-icon.hack, +.tree-expand-icon-type4.disabled .x-icon.hack { + background: url('icon/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-expand-4.png'); + _background: none; +} .tree-vertical-line-type2 .x-icon, .tree-vertical-line-type2:hover .x-icon, .tree-vertical-line-type2:active .x-icon { @@ -126,6 +230,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); _background: none; } +.tree-vertical-line-type2 .x-icon.hack, +.tree-vertical-line-type2:hover .x-icon.hack, +.tree-vertical-line-type2:active .x-icon.hack { + background: url('icon/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); + _background: none; +} .tree-vertical-line-type2.native .x-icon, .tree-vertical-line-type2.disabled .x-icon { display: block; @@ -133,6 +244,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); _background: none; } +.tree-vertical-line-type2.native .x-icon.hack, +.tree-vertical-line-type2.disabled .x-icon.hack { + background: url('icon/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-2.png'); + _background: none; +} .tree-vertical-line-type3 .x-icon, .tree-vertical-line-type3:hover .x-icon, .tree-vertical-line-type3:active .x-icon { @@ -141,6 +258,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); _background: none; } +.tree-vertical-line-type3 .x-icon.hack, +.tree-vertical-line-type3:hover .x-icon.hack, +.tree-vertical-line-type3:active .x-icon.hack { + background: url('icon/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); + _background: none; +} .tree-vertical-line-type3.native .x-icon, .tree-vertical-line-type3.disabled .x-icon { display: block; @@ -148,6 +272,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); _background: none; } +.tree-vertical-line-type3.native .x-icon.hack, +.tree-vertical-line-type3.disabled .x-icon.hack { + background: url('icon/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-3.png'); + _background: none; +} .tree-vertical-line-type4 .x-icon, .tree-vertical-line-type4:hover .x-icon, .tree-vertical-line-type4:active .x-icon { @@ -156,6 +286,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); _background: none; } +.tree-vertical-line-type4 .x-icon.hack, +.tree-vertical-line-type4:hover .x-icon.hack, +.tree-vertical-line-type4:active .x-icon.hack { + background: url('icon/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); + _background: none; +} .tree-vertical-line-type4.native .x-icon, .tree-vertical-line-type4.disabled .x-icon { display: block; @@ -163,6 +300,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); _background: none; } +.tree-vertical-line-type4.native .x-icon.hack, +.tree-vertical-line-type4.disabled .x-icon.hack { + background: url('icon/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-4.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type1 .x-icon, .bi-theme-dark .tree-collapse-icon-type1:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type1:active .x-icon { @@ -171,6 +314,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type1 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type1:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type1:active .x-icon.hack { + background: url('icon/dark/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type1.native .x-icon, .bi-theme-dark .tree-collapse-icon-type1.disabled .x-icon { display: block; @@ -178,6 +328,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type1.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type1.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-1.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type2 .x-icon, .bi-theme-dark .tree-collapse-icon-type2:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type2:active .x-icon { @@ -186,6 +342,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type2 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type2:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type2:active .x-icon.hack { + background: url('icon/dark/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type2.native .x-icon, .bi-theme-dark .tree-collapse-icon-type2.disabled .x-icon { display: block; @@ -193,6 +356,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type2.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type2.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-2.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type3 .x-icon, .bi-theme-dark .tree-collapse-icon-type3:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type3:active .x-icon { @@ -201,6 +370,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type3 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type3:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type3:active .x-icon.hack { + background: url('icon/dark/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type3.native .x-icon, .bi-theme-dark .tree-collapse-icon-type3.disabled .x-icon { display: block; @@ -208,6 +384,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type3.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type3.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-3.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type4 .x-icon, .bi-theme-dark .tree-collapse-icon-type4:hover .x-icon, .bi-theme-dark .tree-collapse-icon-type4:active .x-icon { @@ -216,6 +398,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type4 .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type4:hover .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type4:active .x-icon.hack { + background: url('icon/dark/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); + _background: none; +} .bi-theme-dark .tree-collapse-icon-type4.native .x-icon, .bi-theme-dark .tree-collapse-icon-type4.disabled .x-icon { display: block; @@ -223,6 +412,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); _background: none; } +.bi-theme-dark .tree-collapse-icon-type4.native .x-icon.hack, +.bi-theme-dark .tree-collapse-icon-type4.disabled .x-icon.hack { + background: url('icon/dark/tree-collapse-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-collapse-4.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type1 .x-icon, .bi-theme-dark .tree-expand-icon-type1:hover .x-icon, .bi-theme-dark .tree-expand-icon-type1:active .x-icon { @@ -231,6 +426,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type1 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type1:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type1:active .x-icon.hack { + background: url('icon/dark/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type1.native .x-icon, .bi-theme-dark .tree-expand-icon-type1.disabled .x-icon { display: block; @@ -238,6 +440,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type1.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type1.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-1.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-1.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type2 .x-icon, .bi-theme-dark .tree-expand-icon-type2:hover .x-icon, .bi-theme-dark .tree-expand-icon-type2:active .x-icon { @@ -246,6 +454,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type2 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type2:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type2:active .x-icon.hack { + background: url('icon/dark/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type2.native .x-icon, .bi-theme-dark .tree-expand-icon-type2.disabled .x-icon { display: block; @@ -253,6 +468,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type2.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type2.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-2.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type3 .x-icon, .bi-theme-dark .tree-expand-icon-type3:hover .x-icon, .bi-theme-dark .tree-expand-icon-type3:active .x-icon { @@ -261,6 +482,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type3 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type3:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type3:active .x-icon.hack { + background: url('icon/dark/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type3.native .x-icon, .bi-theme-dark .tree-expand-icon-type3.disabled .x-icon { display: block; @@ -268,6 +496,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type3.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type3.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-3.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type4 .x-icon, .bi-theme-dark .tree-expand-icon-type4:hover .x-icon, .bi-theme-dark .tree-expand-icon-type4:active .x-icon { @@ -276,6 +510,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type4 .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type4:hover .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type4:active .x-icon.hack { + background: url('icon/dark/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); + _background: none; +} .bi-theme-dark .tree-expand-icon-type4.native .x-icon, .bi-theme-dark .tree-expand-icon-type4.disabled .x-icon { display: block; @@ -283,6 +524,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); _background: none; } +.bi-theme-dark .tree-expand-icon-type4.native .x-icon.hack, +.bi-theme-dark .tree-expand-icon-type4.disabled .x-icon.hack { + background: url('icon/dark/tree-expand-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-expand-4.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type2 .x-icon, .bi-theme-dark .tree-vertical-line-type2:hover .x-icon, .bi-theme-dark .tree-vertical-line-type2:active .x-icon { @@ -291,6 +538,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type2 .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type2:hover .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type2:active .x-icon.hack { + background: url('icon/dark/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type2.native .x-icon, .bi-theme-dark .tree-vertical-line-type2.disabled .x-icon { display: block; @@ -298,6 +552,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type2.native .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type2.disabled .x-icon.hack { + background: url('icon/dark/tree-vertical-line-2.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-2.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type3 .x-icon, .bi-theme-dark .tree-vertical-line-type3:hover .x-icon, .bi-theme-dark .tree-vertical-line-type3:active .x-icon { @@ -306,6 +566,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type3 .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type3:hover .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type3:active .x-icon.hack { + background: url('icon/dark/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type3.native .x-icon, .bi-theme-dark .tree-vertical-line-type3.disabled .x-icon { display: block; @@ -313,6 +580,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type3.native .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type3.disabled .x-icon.hack { + background: url('icon/dark/tree-vertical-line-3.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-3.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type4 .x-icon, .bi-theme-dark .tree-vertical-line-type4:hover .x-icon, .bi-theme-dark .tree-vertical-line-type4:active .x-icon { @@ -321,6 +594,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type4 .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type4:hover .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type4:active .x-icon.hack { + background: url('icon/dark/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); + _background: none; +} .bi-theme-dark .tree-vertical-line-type4.native .x-icon, .bi-theme-dark .tree-vertical-line-type4.disabled .x-icon { display: block; @@ -328,12 +608,23 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); _background: none; } +.bi-theme-dark .tree-vertical-line-type4.native .x-icon.hack, +.bi-theme-dark .tree-vertical-line-type4.disabled .x-icon.hack { + background: url('icon/dark/tree-vertical-line-4.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/dark/tree-vertical-line-4.png'); + _background: none; +} .check-box-icon .x-icon { display: block; background: url('icon/check-box-normal.png') no-repeat 0 0; _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); _background: none; } +.check-box-icon .x-icon.hack { + background: url('icon/check-box-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); + _background: none; +} .check-box-icon:hover .x-icon, .check-box-icon:focus .x-icon, .check-box-icon.hover .x-icon { @@ -342,6 +633,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); _background: none; } +.check-box-icon:hover .x-icon.hack, +.check-box-icon:focus .x-icon.hack, +.check-box-icon.hover .x-icon.hack { + background: url('icon/check-box-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-normal.png'); + _background: none; +} .check-box-icon:active .x-icon, .check-box-icon.active .x-icon { display: block; @@ -349,6 +647,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-active.png'); _background: none; } +.check-box-icon:active .x-icon.hack, +.check-box-icon.active .x-icon.hack { + background: url('icon/check-box-active.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-active.png'); + _background: none; +} .check-box-icon.native .x-icon, .check-box-icon.disabled .x-icon { display: block; @@ -356,6 +660,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable.png'); _background: none; } +.check-box-icon.native .x-icon.hack, +.check-box-icon.disabled .x-icon.hack { + background: url('icon/check-box-disable.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable.png'); + _background: none; +} .check-box-icon.native .x-icon, .check-box-icon.disabled.active .x-icon { display: block; @@ -363,12 +673,23 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable2.png'); _background: none; } +.check-box-icon.native .x-icon.hack, +.check-box-icon.disabled.active .x-icon.hack { + background: url('icon/check-box-disable2.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/check-box-disable2.png'); + _background: none; +} .radio-icon .x-icon { display: block; background: url('icon/radio-normal.png') no-repeat 0 0; _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); _background: none; } +.radio-icon .x-icon.hack { + background: url('icon/radio-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); + _background: none; +} .radio-icon:hover .x-icon, .radio-icon:focus .x-icon, .radio-icon.hover .x-icon { @@ -377,6 +698,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); _background: none; } +.radio-icon:hover .x-icon.hack, +.radio-icon:focus .x-icon.hack, +.radio-icon.hover .x-icon.hack { + background: url('icon/radio-normal.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-normal.png'); + _background: none; +} .radio-icon:active .x-icon, .radio-icon.active .x-icon { display: block; @@ -384,6 +712,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-active.png'); _background: none; } +.radio-icon:active .x-icon.hack, +.radio-icon.active .x-icon.hack { + background: url('icon/radio-active.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-active.png'); + _background: none; +} .radio-icon.native .x-icon, .radio-icon.disabled .x-icon { display: block; @@ -391,6 +725,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable.png'); _background: none; } +.radio-icon.native .x-icon.hack, +.radio-icon.disabled .x-icon.hack { + background: url('icon/radio-disable.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable.png'); + _background: none; +} .radio-icon.native .x-icon, .radio-icon.disabled.active .x-icon { display: block; @@ -398,6 +738,12 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable2.png'); _background: none; } +.radio-icon.native .x-icon.hack, +.radio-icon.disabled.active .x-icon.hack { + background: url('icon/radio-disable2.png') no-repeat 0 0; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/radio-disable2.png'); + _background: none; +} .check-half-select-icon .x-icon, .check-half-select-icon:hover .x-icon, .check-half-select-icon:active .x-icon { @@ -406,6 +752,13 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); _background: none; } +.check-half-select-icon .x-icon.hack, +.check-half-select-icon:hover .x-icon.hack, +.check-half-select-icon:active .x-icon.hack { + background: url('icon/half_selected.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); + _background: none; +} .check-half-select-icon.native .x-icon, .check-half-select-icon.disabled .x-icon { display: block; @@ -413,3 +766,9 @@ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); _background: none; } +.check-half-select-icon.native .x-icon.hack, +.check-half-select-icon.disabled .x-icon.hack { + background: url('icon/half_selected.png') no-repeat 0px 0px; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/half_selected.png'); + _background: none; +} diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index a81b98d5b..67e5a7bcb 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -706,7 +706,7 @@ & .bi-textarea { color: inherit; } - background-color: inherit; + background-color: transparent; } &:active, &.active { color: inherit; @@ -716,7 +716,7 @@ & .bi-textarea { color: inherit; } - background-color: inherit; + background-color: transparent; & .bi-high-light { color: inherit; } @@ -748,7 +748,7 @@ & .bi-textarea { color: inherit; } - background-color: inherit; + background-color: transparent; } &:active, &.active { color: inherit; @@ -758,7 +758,7 @@ & .bi-textarea { color: inherit; } - background-color: inherit; + background-color: transparent; & .bi-high-light { color: inherit; } diff --git a/src/less/image.less b/src/less/image.less index a714f1fe3..2c70dcae9 100644 --- a/src/less/image.less +++ b/src/less/image.less @@ -11,18 +11,30 @@ _background: none; } +.image2xPath(@path, @top:center, @left:center, @repeat: no-repeat) when not (@path = none) { + background: url('@{image2xUrl}@{path}') @repeat @left @top; + _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='@{image2xUrl}@{path}'); + _background: none; +} + .icon(@class, @iconPath, @top:0px, @left:0px) { .@{class} { & .x-icon, &:hover .x-icon, &:active .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } } } @@ -31,7 +43,10 @@ .@{class} { & .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } &:hover .x-icon, &:focus .x-icon, @@ -39,12 +54,18 @@ &:active .x-icon, &.active .x-icon { display: block; - .imagePath(@iconPath, -@top, -(@left + @distance)); + .image2xPath(@iconPath, -@top, -(@left + @distance)); + &.hack { + .imagePath(@iconPath, -@top, -(@left + @distance)); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } } } @@ -56,17 +77,26 @@ &:focus .x-icon, &.hover .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } &:active .x-icon, &.active .x-icon { display: block; - .imagePath(@iconPath, -@top, -(@left + @distance)); + .image2xPath(@iconPath, -@top, -(@left + @distance)); + &.hack { + .imagePath(@iconPath, -@top, -(@left + @distance)); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } } } @@ -75,24 +105,36 @@ .@{class} { & .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } &:hover .x-icon, &:focus .x-icon, &.hover .x-icon { display: block; - .imagePath(@iconPath, -@top, -(@left+@distance)); + .image2xPath(@iconPath, -@top, -(@left+@distance)); + &.hack { + .imagePath(@iconPath, -@top, -(@left+@distance)); + } } &:active .x-icon, &.active .x-icon { display: block; - .imagePath(@iconPath, -@top, -(@left+@distance*2)); + .image2xPath(@iconPath, -@top, -(@left+@distance*2)); + &.hack { + .imagePath(@iconPath, -@top, -(@left+@distance*2)); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } } } @@ -101,16 +143,25 @@ .@{class} { & .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } &.active .x-icon { display: block; - .imagePath(@iconPath, -@top, -(@left+@distance)); + .image2xPath(@iconPath, -@top, -(@left+@distance)); + &.hack { + .imagePath(@iconPath, -@top, -(@left+@distance)); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@iconPath, -@top, -@left); + .image2xPath(@iconPath, -@top, -@left); + &.hack { + .imagePath(@iconPath, -@top, -@left); + } } } } @@ -119,29 +170,44 @@ .@{class} { & .x-icon { display: block; - .imagePath(@iconPath, 0, 0); + .image2xPath(@iconPath, 0, 0); + &.hack { + .imagePath(@iconPath, 0, 0); + } } &:hover .x-icon, &:focus .x-icon, &.hover .x-icon { display: block; - .imagePath(@hoverPath, 0, 0); + .image2xPath(@hoverPath, 0, 0); + &.hack { + .imagePath(@hoverPath, 0, 0); + } } &:active .x-icon, &.active .x-icon { display: block; - .imagePath(@activePath, 0, 0); + .image2xPath(@activePath, 0, 0); + &.hack { + .imagePath(@activePath, 0, 0); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@disablePath, 0, 0); + .image2xPath(@disablePath, 0, 0); + &.hack { + .imagePath(@disablePath, 0, 0); + } } &.native .x-icon, &.disabled.active .x-icon { display: block; - .imagePath(@activeDisablePath, 0, 0); + .image2xPath(@activeDisablePath, 0, 0); + &.hack { + .imagePath(@activeDisablePath, 0, 0); + } } } } @@ -150,19 +216,28 @@ .@{class} { & .x-icon { display: block; - .imagePath(@iconPath, 0, 0); + .image2xPath(@iconPath, 0, 0); + &.hack { + .imagePath(@iconPath, 0, 0); + } } &:hover .x-icon, &:focus .x-icon, &.hover .x-icon { display: block; - .imagePath(@hoverPath, 0, 0); + .image2xPath(@hoverPath, 0, 0); + &.hack { + .imagePath(@hoverPath, 0, 0); + } } &.native .x-icon, &.disabled .x-icon { display: block; - .imagePath(@disablePath, 0, 0); + .image2xPath(@disablePath, 0, 0); + &.hack { + .imagePath(@disablePath, 0, 0); + } } } } @@ -177,8 +252,8 @@ .font(@class,@content, @color: @color-bi-font-native) { @fc: "\@{content}"; .@{class} { - & .b-font{ - *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')"; + & .b-font { + *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { content: @fc; @@ -195,8 +270,8 @@ .font-hover(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover) { @fc: "\@{content}"; .@{class} { - & .b-font{ - *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')"; + & .b-font { + *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { content: @fc; @@ -219,8 +294,8 @@ .font-effect(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active, @color-selected: @color-bi-font-active) { @fc: "\@{content}"; .@{class} { - & .b-font{ - *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')"; + & .b-font { + *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { content: @fc; @@ -251,8 +326,8 @@ .font-hover-active(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active) { @fc: "\@{content}"; .@{class} { - & .b-font{ - *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content}')"; + & .b-font { + *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { content: @fc; diff --git a/src/less/var.less b/src/less/var.less index 7d4d2b66e..f23c097ad 100644 --- a/src/less/var.less +++ b/src/less/var.less @@ -1,5 +1,6 @@ @webUrl: ''; @imageUrl: ''; //图片的基本地址 +@image2xUrl: ''; //图片的基本地址 @cursor: '@{imageUrl}cursor/cursor_hand.cur'; @dragCursor: '@{imageUrl}cursor/cursor_drag_hand.cur'; diff --git a/src/widget/datetime/datetime.combo.js b/src/widget/datetime/datetime.combo.js new file mode 100644 index 000000000..8c957cc1f --- /dev/null +++ b/src/widget/datetime/datetime.combo.js @@ -0,0 +1,132 @@ +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeCombo = BI.inherit(BI.Single, { + constants: { + popupHeight: 290, + popupWidth: 270, + comboAdjustHeight: 1, + border: 1, + DATE_MIN_VALUE: "1900-01-01", + DATE_MAX_VALUE: "2099-12-31" + }, + _defaultConfig: function () { + return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), { + baseCls: 'bi-date-time-combo', + height: 24 + }); + }, + _init: function () { + BI.DateTimeCombo.superclass._init.apply(this, arguments); + var self = this; + var date = new Date(); + this.storeValue = { + value: { + year: date.getFullYear(), + month: date.getMonth(), + day: date.getDate(), + hour: date.getHours(), + minute: date.getMinutes(), + second: date.getSeconds() + } + }; + this.trigger = BI.createWidget({ + type: 'bi.date_time_trigger' + }); + + this.trigger.on(BI.DateTrigger.EVENT_TRIGGER_CLICK, function () { + self.combo.toggle(); + }); + + this.popup = BI.createWidget({ + type: "bi.date_time_popup", + min: this.constants.DATE_MIN_VALUE, + max: this.constants.DATE_MAX_VALUE + }); + self.setValue(this.storeValue); + + this.popup.on(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () { + self.setValue(self.storeValue); + self.combo.hideView(); + self.fireEvent(BI.DateTimeCombo.EVENT_CANCEL); + }); + this.popup.on(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE, function () { + self.storeValue = self.popup.getValue(); + self.setValue(self.storeValue); + self.combo.hideView(); + self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM); + }); + this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () { + self.trigger.setValue(self.popup.getValue()); + }); + this.combo = BI.createWidget({ + type: 'bi.combo', + toggle: false, + isNeedAdjustHeight: false, + isNeedAdjustWidth: false, + el: this.trigger, + adjustLength: this.constants.comboAdjustHeight, + popup: { + el: this.popup, + maxHeight: this.constants.popupHeight, + width: this.constants.popupWidth, + stopPropagation: false + } + }); + this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { + self.popup.setValue(self.storeValue); + self.fireEvent(BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW); + }); + + var triggerBtn = BI.createWidget({ + type: "bi.trigger_icon_button", + cls: "chart-date-normal-font bi-border-left bi-border-top bi-border-bottom", + width: 30, + height: 25 + }); + triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { + if (self.combo.isViewVisible()) { + self.combo.hideView(); + } else { + self.combo.showView(); + } + }); + + BI.createWidget({ + type: "bi.htape", + element: this, + items: [{ + type: "bi.absolute", + items: [{ + el: this.combo, + top: 0, + left: 0, + right: 0, + bottom: 0 + }, { + el: triggerBtn, + top: 0, + left: 0 + }] + }] + }) + }, + + setValue: function (v) { + this.storeValue = v; + this.popup.setValue(v); + this.trigger.setValue(v); + }, + getValue: function () { + return { + value: this.storeValue, + text: this.trigger.getValue() + }; + } +}); + +BI.DateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; +BI.DateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.DateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; +BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW = "BI.DateTimeCombo.EVENT_BEFORE_POPUPVIEW"; +BI.shortcut('bi.date_time_combo', BI.DateTimeCombo); diff --git a/src/widget/datetime/datetime.js b/src/widget/datetime/datetime.js new file mode 100644 index 000000000..29f704d60 --- /dev/null +++ b/src/widget/datetime/datetime.js @@ -0,0 +1,38 @@ +/** + * Created by Urthur on 2017/7/14. + */ +BI.CustomDateTimeCombo = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.CustomDateTimeCombo.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-custom-date-time-combo" + }) + }, + + _init: function () { + BI.CustomDateTimeCombo.superclass._init.apply(this, arguments); + var self = this; + this.DateTime = BI.createWidget({ + type: "bi.date_time_combo", + element: this + }); + this.DateTime.on(BI.DateTimeCombo.EVENT_CANCEL, function () { + self.fireEvent(BI.CustomDateTimeCombo.EVENT_CANCEL); + }); + + this.DateTime.on(BI.DateTimeCombo.EVENT_CONFIRM, function () { + self.fireEvent(BI.CustomDateTimeCombo.EVENT_CONFIRM); + }); + }, + + getValue: function () { + return this.DateTime.getValue(); + }, + + setValue: function (v) { + this.DateTime.setValue(v); + } +}); +BI.CustomDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; +BI.CustomDateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; +BI.CustomDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.shortcut("bi.custom_date_time_combo", BI.CustomDateTimeCombo); diff --git a/src/widget/datetime/datetime.popup.js b/src/widget/datetime/datetime.popup.js new file mode 100644 index 000000000..a289311fc --- /dev/null +++ b/src/widget/datetime/datetime.popup.js @@ -0,0 +1,175 @@ +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimePopup = BI.inherit(BI.Widget, { + constants: { + + + triggerHeight: 24, + buttonWidth: 90, + buttonHeight: 25, + popupHeight: 290, + popupWidth: 270, + comboAdjustHeight: 1, + lgap: 2, + border: 1 + }, + _defaultConfig: function () { + return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { + baseCls: 'bi-date-time-popup', + width: 268, + height: 290 + }); + }, + _init: function () { + BI.DateTimePopup.superclass._init.apply(this, arguments); + var self = this; + this.cancelButton = BI.createWidget({ + type: 'bi.text_button', + forceCenter: true, + cls: 'bi-multidate-popup-button bi-border-top bi-border-right', + shadow: true, + text: BI.i18nText("BI-Basic_Cancel") + }); + this.cancelButton.on(BI.TextButton.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE); + }); + + this.okButton = BI.createWidget({ + type: "bi.text_button", + forceCenter: true, + cls: 'bi-multidate-popup-button bi-border-top', + shadow: true, + text: BI.i18nText("BI-Basic_OK") + }); + this.okButton.on(BI.TextButton.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE); + }); + + this.dateCombo = BI.createWidget({ + type: "bi.date_calendar_popup", + min: self.options.min, + max: self.options.max + }); + self.dateCombo.on(BI.DateCalendarPopup.EVENT_CHANGE, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + + this.dateSelect = BI.createWidget({ + type: "bi.horizontal", + cls: "bi-border-top", + items: [{ + type: "bi.label", + text: BI.i18nText("BI-Basic_Time"), + width: 45 + },{ + type: "bi.date_time_select", + max: 23, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.hour = _ref; + self.hour.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + },{ + type: "bi.label", + text: ":", + width: 15 + },{ + type: "bi.date_time_select", + max: 59, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.minute = _ref; + self.minute.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + },{ + type: "bi.label", + text: ":", + width: 15 + },{ + type: "bi.date_time_select", + max: 59, + min: 0, + width: 60, + height: 30, + ref: function (_ref) { + self.second = _ref; + self.second.on(BI.DateTimeSelect.EVENT_CONFIRM, function () { + self.fireEvent(BI.DateTimePopup.CALENDAR_EVENT_CHANGE); + }); + } + }] + }); + + this.dateButton = BI.createWidget({ + type: "bi.grid", + items: [[this.cancelButton, this.okButton]] + }); + BI.createWidget({ + element: this, + type: "bi.vtape", + items: [{ + el: this.dateCombo + }, { + el: this.dateSelect, + height: 50 + },{ + el: this.dateButton, + height: 30 + }] + }); + }, + + setValue: function (v) { + var value, date; + if (BI.isNotNull(v)) { + value = v.value; + if(BI.isNull(value)){ + date = new Date(); + this.dateCombo.setValue({ + year: date.getFullYear(), + month: date.getMonth(), + day: date.getDate() + }); + this.hour.setValue(date.getHours()); + this.minute.setValue(date.getMinutes()); + this.second.setValue(date.getSeconds()); + } else { + this.dateCombo.setValue({ + year: value.year, + month: value.month, + day: value.day + }); + this.hour.setValue(value.hour); + this.minute.setValue(value.minute); + this.second.setValue(value.second); + } + } + }, + + getValue: function () { + return { + value: { + year: this.dateCombo.getValue().year, + month: this.dateCombo.getValue().month, + day: this.dateCombo.getValue().day, + hour: this.hour.getValue(), + minute: this.minute.getValue(), + second: this.second.getValue() + } + } + } +}); +BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; +BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE = "BUTTON_CANCEL_EVENT_CHANGE"; +BI.DateTimePopup.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE"; +BI.shortcut('bi.date_time_popup', BI.DateTimePopup); + diff --git a/src/widget/datetime/datetime.select.js b/src/widget/datetime/datetime.select.js new file mode 100644 index 000000000..d57fedc5c --- /dev/null +++ b/src/widget/datetime/datetime.select.js @@ -0,0 +1,106 @@ +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeSelect = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.DateTimeSelect.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-date-time-select bi-border", + max: 23, + min: 0 + }) + }, + + _init: function () { + BI.DateTimeSelect.superclass._init.apply(this, arguments); + var self = this, o = this.options; + this.editor = BI.createWidget({ + type: "bi.sign_editor", + value: this._alertInEditorValue(o.min), + errorText: BI.i18nText("BI-Please_Input_Natural_Number"), + validationChecker: function(v){ + return BI.isNaturalNumber(v); + } + }); + this.editor.on(BI.TextEditor.EVENT_CONFIRM, function(){ + self._finetuning(0); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this.topBtn = BI.createWidget({ + type: "bi.icon_button", + cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom" + }); + this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){ + self._finetuning(1); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this.bottomBtn = BI.createWidget({ + type: "bi.icon_button", + cls: "column-next-page-h-font bottom-button bi-border-left" + }); + this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){ + self._finetuning(-1); + self.fireEvent(BI.DateTimeSelect.EVENT_CONFIRM); + }); + this._finetuning(0); + BI.createWidget({ + type: "bi.htape", + element: this, + items: [this.editor, { + el: { + type: "bi.grid", + columns: 1, + rows: 2, + items: [{ + column: 0, + row: 0, + el: this.topBtn + }, { + column: 0, + row: 1, + el: this.bottomBtn + }] + }, + width: 30 + }] + }); + }, + + _alertOutEditorValue: function(v){ + if (v > this.options.max){ + v = this.options.min; + } + if (v < this.options.min){ + v = this.options.max + } + return BI.parseInt(v); + }, + + _alertInEditorValue: function(v){ + if (v > this.options.max){ + v = this.options.min; + } + if (v < this.options.min){ + v = this.options.max; + } + v = v < 10 ? "0" + v : v; + return v; + }, + + _finetuning: function(add){ + var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue())); + this.editor.setValue(this._alertInEditorValue(v + add)); + }, + + getValue: function () { + var v = this.editor.getValue(); + return this._alertOutEditorValue(v); + }, + + setValue: function (v) { + this.editor.setValue(this._alertInEditorValue(v)); + this._finetuning(0); + } + +}); +BI.DateTimeSelect.EVENT_CONFIRM = "EVENT_CONFIRM"; +BI.shortcut("bi.date_time_select", BI.DateTimeSelect); diff --git a/src/widget/datetime/datetime.trigger.js b/src/widget/datetime/datetime.trigger.js new file mode 100644 index 000000000..1a43f7d1e --- /dev/null +++ b/src/widget/datetime/datetime.trigger.js @@ -0,0 +1,68 @@ +/** + * Created by Urthur on 2017/7/14. + */ +BI.DateTimeTrigger = BI.inherit(BI.Trigger, { + _const: { + hgap: 4, + vgap: 2, + triggerWidth: 30 + }, + + _defaultConfig: function () { + return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), { + extraCls: "bi-date-time-trigger", + height: 25, + width: 180 + }); + }, + _init: function () { + BI.DateTimeTrigger.superclass._init.apply(this, arguments); + var self = this, o = this.options, c = this._const; + this.text = BI.createWidget({ + type: "bi.label", + cls: "bi-border", + textAlign: "left", + height: o.height, + width: o.width, + hgap: c.hgap, + vgap: c.vgap + }); + BI.createWidget({ + type: "bi.htape", + element: this, + items: [{ + el: BI.createWidget(), + width: 30 + }, { + el: this.text + }] + }) + }, + + _printTime: function (v) { + return v < 10 ? "0" + v : v; + }, + + setValue: function (v) { + var self = this; + if (BI.isNotNull(v)) { + var value = v.value, dateStr; + if(BI.isNull(value)){ + value = new Date(); + dateStr = value.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) + + " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds()); + } else { + dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day) + + " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second); + } + this.text.setText(dateStr); + this.text.setTitle(dateStr); + } + }, + getValue: function () { + return this.text.getText(); + } + +}); +BI.DateTrigger.EVENT_TRIGGER_CLICK = "EVENT_TRIGGER_CLICK"; +BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger); diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index b4096e75d..acd0f0d99 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -24,6 +24,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { self.trigger.getCounter().setButtonChecked(self.storeValue); }; this.storeValue = {}; + //标记正在请求数据 + this.requesting = false; this.trigger = BI.createWidget({ type: "bi.multi_select_trigger", @@ -162,10 +164,16 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { self.populate(); }); }); + //当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件 + this.wants2Quit = false; this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () { //important:关闭弹出时又可能没有退出编辑状态 self.trigger.stopEditing(); - self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + if (self.requesting === true) { + self.wants2Quit = true; + } else { + self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + } }); var triggerBtn = BI.createWidget({ @@ -218,6 +226,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { _joinKeywords: function (keywords, callback) { var self = this, o = this.options; this._assertValue(this.storeValue); + this.requesting = true; o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, keywords: keywords @@ -240,6 +249,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { _joinAll: function (res, callback) { var self = this, o = this.options; this._assertValue(res); + this.requesting = true; o.itemsCreator({ type: BI.MultiSelectCombo.REQ_GET_ALL_DATA, keywords: [this.trigger.getKey()] @@ -300,6 +310,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { value: [] } } + if (self.wants2Quit === true) { + self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); + self.wants2Quit = false; + } + self.requesting = false; } },