diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index a5abef2e2..9a40926c7 100644 --- a/dist/2.0/fineui.css +++ b/dist/2.0/fineui.css @@ -4664,44 +4664,60 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); } .bi-farbtastic .wheel { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/wheel.png') no-repeat center center; diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 0dd8d8df9..7d1d74a98 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -56859,6 +56859,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -58218,7 +58219,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -58445,20 +58447,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -69022,6 +69025,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -69102,7 +69106,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -69995,7 +70000,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -70074,15 +70080,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -73570,6 +73570,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -81600,7 +81601,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -81614,7 +81616,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -82225,7 +82228,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 6d4978a38..4394ce719 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57263,6 +57263,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -58622,7 +58623,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -58849,20 +58851,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -69426,6 +69429,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -69506,7 +69510,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -70399,7 +70404,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -70478,15 +70484,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -73974,6 +73974,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -82004,7 +82005,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -82018,7 +82020,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -82629,7 +82632,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/bundle.css b/dist/bundle.css index a5abef2e2..9a40926c7 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -4664,44 +4664,60 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); } .bi-farbtastic .wheel { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/wheel.png') no-repeat center center; diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 0dd8d8df9..7d1d74a98 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -56859,6 +56859,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -58218,7 +58219,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -58445,20 +58447,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -69022,6 +69025,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -69102,7 +69106,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -69995,7 +70000,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -70074,15 +70080,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -73570,6 +73570,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -81600,7 +81601,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -81614,7 +81616,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -82225,7 +82228,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/bundle.js b/dist/bundle.js index 6d4978a38..4394ce719 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57263,6 +57263,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -58622,7 +58623,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -58849,20 +58851,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -69426,6 +69429,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -69506,7 +69510,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -70399,7 +70404,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -70478,15 +70484,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -73974,6 +73974,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -82004,7 +82005,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -82018,7 +82020,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -82629,7 +82632,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/case.js b/dist/case.js index 6d4b3ce86..fcc60e65e 100644 --- a/dist/case.js +++ b/dist/case.js @@ -4839,6 +4839,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -6198,7 +6199,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -6425,20 +6427,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); diff --git a/dist/core.js b/dist/core.js index 97efc08aa..286e4994c 100644 --- a/dist/core.js +++ b/dist/core.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; diff --git a/dist/fineui.css b/dist/fineui.css index 4888b6cb5..6bed05fd1 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -4664,44 +4664,60 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); } .bi-farbtastic .wheel { background: url('resources?path=/com/fr/web/ui/images/1x/background/wheel.png') no-repeat center center; diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 5b2988919..32b3af907 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -21941,7 +21941,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57104,6 +57104,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -58463,7 +58464,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -58690,20 +58692,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -69267,6 +69270,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -69347,7 +69351,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -70240,7 +70245,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -70319,15 +70325,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -73815,6 +73815,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -81845,7 +81846,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -81859,7 +81861,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -82470,7 +82473,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/fineui.js b/dist/fineui.js index 8b59ba1cf..77a3c6d3c 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -21941,7 +21941,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57508,6 +57508,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -58867,7 +58868,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -59094,20 +59096,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -69671,6 +69674,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -69751,7 +69755,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -70644,7 +70649,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -70723,15 +70729,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -74219,6 +74219,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -82249,7 +82250,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -82263,7 +82265,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -82874,7 +82877,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 51ffd075b..333e7c7bc 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -40390,6 +40390,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, @@ -41749,7 +41750,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -41976,20 +41978,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); @@ -52277,6 +52280,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -52357,7 +52361,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -53250,7 +53255,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -53329,15 +53335,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -56825,6 +56825,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -64855,7 +64856,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -64869,7 +64871,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -65480,7 +65483,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/dist/resource.css b/dist/resource.css index e7e2dab5d..24e6c4ada 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -30,44 +30,60 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); } .bi-farbtastic .wheel { background: url('images/1x/background/wheel.png') no-repeat center center; diff --git a/dist/widget.js b/dist/widget.js index 5292f0b88..9c455f049 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -7092,6 +7092,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -7172,7 +7173,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -8065,7 +8067,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -8144,15 +8147,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { @@ -11640,6 +11637,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, @@ -19670,7 +19668,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -19684,7 +19683,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { @@ -20295,7 +20295,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/public/css/app.css b/public/css/app.css index 5f2aefb36..59e5c4091 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -30,42 +30,58 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); } diff --git a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js index c1a6092d6..e5b75d153 100644 --- a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js @@ -25,6 +25,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value, o.items), value: o.value, height: o.height, diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js index 7514e6ad9..a121e764e 100644 --- a/src/case/editor/editor.state.js +++ b/src/case/editor/editor.state.js @@ -21,7 +21,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: BI.i18nText("BI-Basic_Unrestricted") // 显示值 }); }, @@ -248,20 +249,21 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.text.setText(BI.i18nText("BI-Select_Part")); this.text.element.removeClass("bi-water-mark"); } else { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } return; } if (BI.isString(v)) { this.text.setText(v); - v === o.text ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); + // 配置了defaultText才判断标灰，其他情况不标灰 + (BI.isKey(o.defaultText) && o.defaultText === v) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); return; } if (BI.isArray(v)) { if (BI.isEmpty(v)) { - this.text.setText(o.text); - this.text.element.addClass("bi-water-mark"); + this.text.setText(BI.isKey(o.defaultText) ? o.defaultText : o.text); + BI.isKey(o.defaultText) ? this.text.element.addClass("bi-water-mark") : this.text.element.removeClass("bi-water-mark"); } else if (v.length === 1) { this.text.setText(v[0]); this.text.element.removeClass("bi-water-mark"); diff --git a/src/core/platform/web/detectElementResize.js b/src/core/platform/web/detectElementResize.js index 0ca867207..b34d21771 100644 --- a/src/core/platform/web/detectElementResize.js +++ b/src/core/platform/web/detectElementResize.js @@ -114,7 +114,7 @@ var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; diff --git a/src/css/resource/app.css b/src/css/resource/app.css index 5f2aefb36..59e5c4091 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -30,42 +30,58 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); } diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 439dbef69..958f83f57 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -102,7 +102,9 @@ @border-color-disabled-theme-dark: #606479; //scroll color -@scroll-color: #20263b; +@scroll-color: #232e40; @scroll-color-theme-dark: #ffffff; +@scroll-thumb-color: #232e40; +@scroll-thumb-color-theme-dark: #232e40; @water-mark-color-theme-dark: #878d9f; diff --git a/src/less/resource/app.less b/src/less/resource/app.less index c0d43653b..1c759ab01 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -29,15 +29,23 @@ body { div, textarea { &::-webkit-scrollbar { -webkit-appearance: none; + width: 10px; + height: 10px; + } + &::-webkit-scrollbar-track { + .border-radius(5px); .background-color(@scroll-color, 5%); - width: 6px; - height: 6px; + &:hover { + .background-color(@scroll-color, 5%); + } } &::-webkit-scrollbar-thumb { - .border-radius(0); - .background-color(@scroll-color, 30%); + border: 2px solid transparent; + background-clip: padding-box; + .border-radius(10px); + .background-color(@scroll-color, 10%); &:hover { - .background-color(@scroll-color, 70%); + .background-color(@scroll-color, 30%); } } } @@ -46,15 +54,17 @@ div, textarea { div, textarea { &::-webkit-scrollbar { -webkit-appearance: none; + } + &::-webkit-scrollbar-track { .background-color(@scroll-color-theme-dark, 5%); - width: 6px; - height: 6px; + &:hover { + .background-color(@scroll-color-theme-dark, 5%); + } } &::-webkit-scrollbar-thumb { - .border-radius(0); - .background-color(@scroll-color-theme-dark, 30%); + .background-color(@scroll-color-theme-dark, 10%); &:hover { - .background-color(@scroll-color-theme-dark, 70%); + .background-color(@scroll-color-theme-dark, 30%); } } } diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index 93dabd8b7..72bc3c97e 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js @@ -29,6 +29,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + defaultText: o.text, text: this._digest(o.value), value: o.value, height: o.height, @@ -109,7 +110,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index 87c16f2af..a1ee9e257 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -29,7 +29,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: o.text, + defaultText: o.text, + text: this._digest(o.value), value: o.value, height: o.height, tipText: "", @@ -108,15 +109,9 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, - mounted: function () { - var o = this.options; - if(BI.isKey(o.value)) { - this.setValue([o.value]); - } - }, - _digest: function (v) { - return this.options.valueFormatter(v); + var o = this.options; + return o.valueFormatter(v) || o.text; }, stopEditing: function () { diff --git a/src/widget/multiselect/trigger/editor.multiselect.js b/src/widget/multiselect/trigger/editor.multiselect.js index 8ba3ba26a..376070f95 100644 --- a/src/widget/multiselect/trigger/editor.multiselect.js +++ b/src/widget/multiselect/trigger/editor.multiselect.js @@ -23,6 +23,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, + defaultText: o.text, text: o.text, tipType: o.tipType, warningTitle: o.warningTitle, diff --git a/src/widget/singleselect/trigger/editor.singleselect.js b/src/widget/singleselect/trigger/editor.singleselect.js index 245565137..295b9261c 100644 --- a/src/widget/singleselect/trigger/editor.singleselect.js +++ b/src/widget/singleselect/trigger/editor.singleselect.js @@ -9,7 +9,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-select-editor", - el: {} + el: {}, + text: BI.i18nText("BI-Basic_Please_Select") }); }, @@ -23,7 +24,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { watermark: BI.i18nText("BI-Basic_Search"), allowBlank: true, value: o.value, - text: o.text + defaultText: o.text, + text: o.text, }); this.editor.on(BI.Controller.EVENT_CHANGE, function () { diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index 3e1215935..1800c28eb 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -157,7 +157,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, { v = o.digit === false ? v : v.toFixed(o.digit); self.label.setValue(v); self.value = v; - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); } }, function () { if (startDrag === true) { diff --git a/ui/css/app.css b/ui/css/app.css index 5f2aefb36..59e5c4091 100644 --- a/ui/css/app.css +++ b/ui/css/app.css @@ -30,42 +30,58 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(32, 38, 59, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); - width: 6px; - height: 6px; + width: 10px; + height: 10px; +} +div::-webkit-scrollbar-track, +textarea::-webkit-scrollbar-track { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); +} +div::-webkit-scrollbar-track:hover, +textarea::-webkit-scrollbar-track:hover { + background-color: rgba(35, 46, 64, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d232e40,endColorstr=#0d232e40); } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(32, 38, 59, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); + border: 2px solid transparent; + background-clip: padding-box; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + background-color: rgba(35, 46, 64, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a232e40,endColorstr=#1a232e40); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(32, 38, 59, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); + background-color: rgba(35, 46, 64, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d232e40,endColorstr=#4d232e40); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; +} +.bi-theme-dark div::-webkit-scrollbar-track, +.bi-theme-dark textarea::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); +} +.bi-theme-dark div::-webkit-scrollbar-track:hover, +.bi-theme-dark textarea::-webkit-scrollbar-track:hover { background-color: rgba(255, 255, 255, 0.05); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff); - width: 6px; - height: 6px; } .bi-theme-dark div::-webkit-scrollbar-thumb, .bi-theme-dark textarea::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: rgba(255, 255, 255, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); + background-color: rgba(255, 255, 255, 0.1); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1affffff,endColorstr=#1affffff); } .bi-theme-dark div::-webkit-scrollbar-thumb:hover, .bi-theme-dark textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3ffffff,endColorstr=#b3ffffff); + background-color: rgba(255, 255, 255, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dffffff,endColorstr=#4dffffff); }