diff --git a/bi/base.js b/bi/base.js index e65c5645f..a7fe770ab 100644 --- a/bi/base.js +++ b/bi/base.js @@ -881,8 +881,8 @@ BI.BasicButton = BI.inherit(BI.Single, { return this.options.text; }, - setEnable: function (b) { - BI.BasicButton.superclass.setEnable.apply(this, arguments); + _setEnable: function (b) { + BI.BasicButton.superclass._setEnable.apply(this, arguments); if (!b) { if (this.options.shadow) { this.$mask && this.$mask.setVisible(false); @@ -1166,13 +1166,6 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { this.layouts = BI.createWidget(BI.extend({element: this}, this._packageLayout(items))); }, - setEnable: function (b) { - BI.ButtonGroup.superclass.setEnable.apply(this, arguments); - BI.each(this.buttons, function (i, item) { - item.setEnable(b); - }); - }, - setNotSelectedValue: function (v) { v = BI.isArray(v) ? v : [v]; BI.each(this.buttons, function (i, item) { @@ -3192,10 +3185,8 @@ BI.Combo = BI.inherit(BI.Widget, { this.combo.populate.apply(this.combo, arguments); }, - setEnable: function (arg) { - BI.Combo.superclass.setEnable.apply(this, arguments); - this.combo && this.combo.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); + _setEnable: function (arg) { + BI.Combo.superclass._setEnable.apply(this, arguments); !arg && this.isViewVisible() && this._hideView(); }, @@ -3304,7 +3295,7 @@ BI.Expander = BI.inherit(BI.Widget, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Expander.EVENT_EXPAND); } - if(type === BI.Events.COLLAPSE) { + if (type === BI.Events.COLLAPSE) { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Expander.EVENT_COLLAPSE); } @@ -3461,11 +3452,9 @@ BI.Expander = BI.inherit(BI.Widget, { this.expander.populate.apply(this.expander, arguments); }, - setEnable: function (arg) { - BI.Expander.superclass.setEnable.apply(this, arguments); - this.expander && this.expander.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); - !arg && this._hideView(); + _setEnable: function (arg) { + BI.Expander.superclass._setEnable.apply(this, arguments); + !arg && this.isViewVisible() && this._hideView(); }, setValue: function (v) { @@ -3625,11 +3614,6 @@ BI.ComboGroup = BI.inherit(BI.Widget, { }) }, - setEnable: function (b) { - BI.ComboGroup.superclass.setEnable.apply(this, arguments); - this.combo && this.combo.setEnable(b); - }, - getValue: function () { return this.combo.getValue(); }, @@ -3920,10 +3904,6 @@ BI.Loader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (v) { - this.button_group.setEnable(v); - }, - doBehavior: function () { this.button_group.doBehavior.apply(this.button_group, arguments); }, @@ -4629,11 +4609,9 @@ BI.Switcher = BI.inherit(BI.Widget, { this.switcher.populate.apply(this.switcher, arguments); }, - setEnable: function (arg) { - BI.Switcher.superclass.setEnable.apply(this, arguments); - this.switcher && this.switcher.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); - !arg && this._hideView(); + _setEnable: function (arg) { + BI.Switcher.superclass._setEnable.apply(this, arguments); + !arg && this.isViewVisible() && this._hideView(); }, setValue: function (v) { @@ -15281,11 +15259,6 @@ BI.PopupView = BI.inherit(BI.Widget, { this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}) }, - setEnable: function (arg) { - BI.PopupView.superclass.setEnable.apply(this, arguments); - this.view && this.view.setEnable(arg); - }, - setValue: function (selectedValues) { this.tab && this.tab.setValue(selectedValues); this.button_group.setValue(selectedValues); @@ -16092,12 +16065,6 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) { } }, - setEnable: function (b) { - BI.Button.superclass.setEnable.apply(this, arguments); - // this.text.setEnable(b); - // this.icon && this.icon.setEnable(b); - }, - doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, @@ -17470,8 +17437,8 @@ BI.CodeEditor = BI.inherit(BI.Single, { } }, - setEnable: function (b) { - BI.CodeEditor.superclass.setEnable.apply(this, arguments); + _setEnable: function (b) { + BI.CodeEditor.superclass._setEnable.apply(this, arguments); this.editor.setOption("readOnly", b === true ? false : "nocursor") }, @@ -17842,12 +17809,6 @@ BI.Editor = BI.inherit(BI.Single, { isValid: function () { return this.editor.isValid(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); - this.watermark && this.watermark.setEnable(b); } }); BI.Editor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -17950,11 +17911,6 @@ BI.MultifileEditor = BI.inherit(BI.Single, { reset: function () { this.file.reset(); - }, - - setEnable: function (enable) { - BI.MultiFile.superclass.setEnable.apply(this, arguments); - this.file.setEnable(enable); } }); BI.MultifileEditor.EVENT_CHANGE = "MultifileEditor.EVENT_CHANGE"; @@ -18117,12 +18073,6 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { BI.TextAreaEditor.superclass.setValid.apply(this, arguments); this.content.setValid(b); this.watermark && this.watermark.setValid(b); - }, - - setEnable: function (b) { - BI.TextAreaEditor.superclass.setEnable.apply(this, arguments); - this.content.setEnable(b); - this.watermark && this.watermark.setEnable(b); } }); BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -18857,8 +18807,8 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/** this.wrap.attachNum = 0; }, - setEnable: function (enable) { - BI.File.superclass.setEnable.apply(this, arguments); + _setEnable: function (enable) { + BI.File.superclass._setEnable.apply(this, arguments); if (enable === true) { this.element.attr("disabled", "disabled"); } else { @@ -19130,8 +19080,8 @@ BI.Input = BI.inherit(BI.Single, { } }, - setEnable: function (b) { - BI.Input.superclass.setEnable.apply(this, [b]); + _setEnable: function (b) { + BI.Input.superclass._setEnable.apply(this, [b]); this.element[0].disabled = !b; } }); @@ -32563,11 +32513,6 @@ BI.CustomTree = BI.inherit(BI.Widget, { this.initTree(this.options.items); }, - setEnable: function (v) { - BI.CustomTree.superclass.setEnable.apply(this, arguments); - this.tree.setEnable(v) - }, - _formatItems: function (nodes) { var self = this, o = this.options; nodes = BI.Tree.transformToTreeFormat(nodes); diff --git a/bi/case.js b/bi/case.js index 039b4873e..697267ae7 100644 --- a/bi/case.js +++ b/bi/case.js @@ -77,11 +77,6 @@ BI.IconChangeButton = BI.inherit(BI.Single, { this.element.removeClass(o.iconClass).addClass(cls); o.iconClass = cls; } - }, - - setEnable: function (b) { - BI.IconChangeButton.superclass.setEnable.apply(this, arguments); - this.button.setEnable(b); } }); BI.IconChangeButton.EVENT_CHANGE = "IconChangeButton.EVENT_CHANGE"; @@ -197,11 +192,6 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { })))); }, - setEnable: function (v) { - BI.MultiSelectItem.superclass.setEnable.apply(this, arguments); - this.checkbox.setEnable(v); - }, - doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, @@ -2373,10 +2363,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, { return this.combo.isViewVisible(); }, - setEnable: function (v) { - this.combo.setEnable(v) - }, - setValue: function (color) { this.combo.setValue(color); }, @@ -3600,10 +3586,6 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isViewVisible: function () { return this.combo.isViewVisible(); - }, - - setEnable: function (v) { - this.combo.setEnable(!!v); } }); @@ -3799,11 +3781,6 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { this.editorIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.EditorIconCheckCombo.superclass.setEnable.apply(this, arguments); - this.editorIconCheckCombo.setEnable(v); - }, - getValue: function () { return this.trigger.getValue(); }, @@ -4141,11 +4118,6 @@ BI.IconCombo = BI.inherit(BI.Widget, { this.iconCombo.setValue(v); }, - setEnable: function (v) { - BI.IconCombo.superclass.setEnable.apply(this, arguments); - this.iconCombo.setEnable(v); - }, - getValue: function () { return this.iconCombo.getValue(); }, @@ -4431,11 +4403,6 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, { this.textIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.TextValueCheckCombo.superclass.setEnable.apply(this, arguments); - this.textIconCheckCombo.setEnable(v); - }, - setWarningTitle: function (title) { this.trigger.setWarningTitle(title); }, @@ -4503,11 +4470,6 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, { this.SmallTextIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.SmallTextValueCheckCombo.superclass.setEnable.apply(this, arguments); - this.SmallTextIconCheckCombo.setEnable(v); - }, - getValue: function () { return this.SmallTextIconCheckCombo.getValue(); }, @@ -4632,11 +4594,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { this.textIconCombo.setValue(v); }, - setEnable: function (v) { - BI.TextValueCombo.superclass.setEnable.apply(this, arguments); - this.textIconCombo.setEnable(v); - }, - getValue: function () { return this.textIconCombo.getValue(); }, @@ -4702,11 +4659,6 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { this.SmallTextValueCombo.setValue(v); }, - setEnable: function (v) { - BI.SmallTextValueCombo.superclass.setEnable.apply(this, arguments); - this.SmallTextValueCombo.setEnable(v); - }, - getValue: function () { return this.SmallTextValueCombo.getValue(); }, @@ -4840,11 +4792,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { this.trigger.setValue(v.childValue || v.value); }, - setEnable: function (v) { - BI.TextValueDownListCombo.superclass.setEnable.apply(this, arguments); - this.combo.setEnable(v); - }, - getValue: function () { var v = this.combo.getValue()[0]; return [v.childValue || v.value]; @@ -5248,12 +5195,6 @@ BI.SearchEditor = BI.inherit(BI.Widget, { isValid: function () { return this.editor.isValid(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); - this.clear.setEnable(b); } }); BI.SearchEditor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -6186,11 +6127,6 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.editor.setValue(k); }, - setEnable: function (v) { - this.text.setEnable(v); - this.editor.setEnable(v); - }, - getValue: function () { return this.editor.getValue(); }, @@ -6464,11 +6400,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, { this.editor.setValue(k); }, - setEnable: function(v){ - this.text.setEnable(v); - this.editor.setEnable(v); - }, - getValue: function () { return this.editor.getValue(); }, @@ -6666,11 +6597,6 @@ BI.TextEditor = BI.inherit(BI.Widget, { getValue: function () { return this.editor.getValue(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); } }); BI.TextEditor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -8714,10 +8640,6 @@ BI.Segment = BI.inherit(BI.Widget, { this.buttonGroup.setEnabledValue(v); }, - setEnable: function (v) { - this.buttonGroup.setEnable(v); - }, - getValue: function () { return this.buttonGroup.getValue(); } @@ -10452,13 +10374,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { var isAllChecked = this.options.isAllCheckedBySelectedValue.apply(this, arguments); this.setSelected(isAllChecked); !isAllChecked && this.setHalfSelected(this.options.isHalfCheckedBySelectedValue.apply(this, arguments)); - }, - - setEnable: function (b) { - BI.MultiSelectBar.superclass.setEnable.apply(this, arguments); - this.checkbox.setEnable(b); - this.half.setEnable(b); - this.text.setEnable(b); } }); BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE"; @@ -11157,12 +11072,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); }, - setEnable: function (v) { - BI.TextTrigger.superclass.setEnable.apply(this, arguments); - this.trigerButton.setEnable(v); - this.text.setEnable(v); - }, - setValue: function (value) { this.text.setValue(value); this.text.setTitle(value); @@ -11327,12 +11236,6 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, { }); }, - setEnable: function (v) { - BI.SmallTextTrigger.superclass.setEnable.apply(this, arguments); - this.trigerButton.setEnable(v); - this.text.setEnable(v); - }, - setValue: function (value) { this.text.setValue(value); }, diff --git a/bi/core.css b/bi/core.css index 25c5635c6..ed35e8965 100644 --- a/bi/core.css +++ b/bi/core.css @@ -3078,8 +3078,8 @@ i { } .bi-z-index-mask { color: #ffffff; - background-color: rgba(26, 26, 26, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d1a1a1a,endColorstr=#4d1a1a1a); + background-color: rgba(26, 26, 26, 0.5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); } .bi-list-item:hover, .bi-list-item.hover { diff --git a/bi/core.js b/bi/core.js index ef35ce451..f311b8aeb 100644 --- a/bi/core.js +++ b/bi/core.js @@ -4432,17 +4432,18 @@ BI.Widget = BI.inherit(BI.OB, { _initVisualEffects: function () { var o = this.options; if (o.invisible) { - this.element.hide(); + //用display属性做显示和隐藏,否则jquery会在显示时将display设为block会覆盖掉display:flex属性 + this.element.css("display", "none"); } if (o.disabled || o.invalid) { - BI.nextTick(BI.bind(function () { - if (this.options.disabled) { - this.setEnable(false); - } - if (this.options.invalid) { - this.setValid(false); - } - }, this)); + // BI.nextTick(BI.bind(function () { + if (this.options.disabled) { + this.setEnable(false); + } + if (this.options.invalid) { + this.setValid(false); + } + // }, this)); } }, @@ -4490,6 +4491,7 @@ BI.Widget = BI.inherit(BI.OB, { this._isMounted = true; this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { + !self.isEnabled() && widget._setEnable(false); widget._mount && widget._mount(); }); this.mounted && this.mounted(); @@ -4511,12 +4513,23 @@ BI.Widget = BI.inherit(BI.OB, { this._initElementHeight(); }, - setEnable: function (enable) { + _setEnable: function (enable) { if (enable === true) { this.options.disabled = false; - this.element.removeClass("base-disabled disabled"); } else if (enable === false) { this.options.disabled = true; + } + //递归将所有子组件使能 + BI.each(this._children, function (i, child) { + child._setEnable && child._setEnable(enable); + }); + }, + + setEnable: function (enable) { + this._setEnable(enable); + if (enable === true) { + this.element.removeClass("base-disabled disabled"); + } else if (enable === false) { this.element.addClass("base-disabled disabled"); } }, diff --git a/bi/widget.js b/bi/widget.js index 42fb0ced5..9ec134e1a 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -10048,10 +10048,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (arg) { - this.button_group.setEnable(arg); - }, - resetHeight: function (h) { this.button_group.resetHeight(h); }, @@ -10138,10 +10134,6 @@ BI.MultiSelectPopupView = BI.inherit(BI.Widget, { this.popupView.populate.apply(this.popupView, arguments); }, - setEnable: function (arg) { - this.popupView.setEnable(arg); - }, - resetHeight: function (h) { this.popupView.resetHeight(h); }, @@ -10291,10 +10283,6 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { this.numberCounter.setValue(ob); }, - setEnable: function (v) { - this.searcher.setEnable(v); - }, - getKey: function () { return this.searcher.getKey(); }, @@ -10454,10 +10442,6 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (arg) { - this.button_group.setEnable(arg); - }, - resetHeight: function (h) { this.button_group.resetHeight(h); }, @@ -10703,10 +10687,6 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { this.editor.setValue(v); }, - setEnable: function(v){ - this.editor.setEnable(v); - }, - getValue: function () { var v = this.editor.getState(); if (BI.isArray(v) && v.length > 0) { @@ -10866,10 +10846,6 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { return this.searcher.getValue(); }, - setEnable: function (v) { - this.editor.setEnable(v); - }, - populate: function (items) { this.searcher.populate.apply(this.searcher, arguments); } @@ -11267,11 +11243,6 @@ BI.MultiStringList = BI.inherit(BI.Widget, { this.trigger.getSearcher().adjustView(); }, - setEnable: function (v) { - this.trigger.setEnable(v); - this.popup.setEnable(v); - }, - setValue: function (v) { this.storeValue = v || {}; this._assertValue(this.storeValue); @@ -11649,10 +11620,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { this.combo.hideView(); }, - setEnable: function (v) { - this.combo.setEnable(v); - }, - setValue: function (v) { this.storeValue.value = v || {}; this.combo.setValue({ @@ -11752,10 +11719,6 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, { return this.tree.hasChecked(); }, - setEnable: function (arg) { - this.popupView.setEnable(arg); - }, - resetHeight: function (h) { this.popupView.resetHeight(h); }, @@ -12030,10 +11993,6 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { return this.editor.getValue(); }, - setEnable: function(v){ - this.editor.setEnable(v); - }, - getValue: function () { return this.searcher.getValue(); }, @@ -12200,11 +12159,6 @@ BI.MultiTreeList = BI.inherit(BI.Widget, { this.trigger.getSearcher().adjustView(); }, - setEnable: function (v) { - this.trigger.setEnable(v); - this.popup.setEnable(v); - }, - setValue: function (v) { this.storeValue.value = v || {}; this.popup.setValue({ @@ -12704,13 +12658,6 @@ BI.NumericalInterval = BI.inherit(BI.Single, { return this.options.validation === "valid"; }, - setEnable: function (b) { - this.smallEditor.setEnable(b); - this.smallCombo.setEnable(b); - this.bigEditor.setEnable(b); - this.bigCombo.setEnable(b); - }, - setMinEnable: function (b) { this.smallEditor.setEnable(b); }, diff --git a/docs/base.js b/docs/base.js index e65c5645f..a7fe770ab 100644 --- a/docs/base.js +++ b/docs/base.js @@ -881,8 +881,8 @@ BI.BasicButton = BI.inherit(BI.Single, { return this.options.text; }, - setEnable: function (b) { - BI.BasicButton.superclass.setEnable.apply(this, arguments); + _setEnable: function (b) { + BI.BasicButton.superclass._setEnable.apply(this, arguments); if (!b) { if (this.options.shadow) { this.$mask && this.$mask.setVisible(false); @@ -1166,13 +1166,6 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { this.layouts = BI.createWidget(BI.extend({element: this}, this._packageLayout(items))); }, - setEnable: function (b) { - BI.ButtonGroup.superclass.setEnable.apply(this, arguments); - BI.each(this.buttons, function (i, item) { - item.setEnable(b); - }); - }, - setNotSelectedValue: function (v) { v = BI.isArray(v) ? v : [v]; BI.each(this.buttons, function (i, item) { @@ -3192,10 +3185,8 @@ BI.Combo = BI.inherit(BI.Widget, { this.combo.populate.apply(this.combo, arguments); }, - setEnable: function (arg) { - BI.Combo.superclass.setEnable.apply(this, arguments); - this.combo && this.combo.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); + _setEnable: function (arg) { + BI.Combo.superclass._setEnable.apply(this, arguments); !arg && this.isViewVisible() && this._hideView(); }, @@ -3304,7 +3295,7 @@ BI.Expander = BI.inherit(BI.Widget, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Expander.EVENT_EXPAND); } - if(type === BI.Events.COLLAPSE) { + if (type === BI.Events.COLLAPSE) { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Expander.EVENT_COLLAPSE); } @@ -3461,11 +3452,9 @@ BI.Expander = BI.inherit(BI.Widget, { this.expander.populate.apply(this.expander, arguments); }, - setEnable: function (arg) { - BI.Expander.superclass.setEnable.apply(this, arguments); - this.expander && this.expander.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); - !arg && this._hideView(); + _setEnable: function (arg) { + BI.Expander.superclass._setEnable.apply(this, arguments); + !arg && this.isViewVisible() && this._hideView(); }, setValue: function (v) { @@ -3625,11 +3614,6 @@ BI.ComboGroup = BI.inherit(BI.Widget, { }) }, - setEnable: function (b) { - BI.ComboGroup.superclass.setEnable.apply(this, arguments); - this.combo && this.combo.setEnable(b); - }, - getValue: function () { return this.combo.getValue(); }, @@ -3920,10 +3904,6 @@ BI.Loader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (v) { - this.button_group.setEnable(v); - }, - doBehavior: function () { this.button_group.doBehavior.apply(this.button_group, arguments); }, @@ -4629,11 +4609,9 @@ BI.Switcher = BI.inherit(BI.Widget, { this.switcher.populate.apply(this.switcher, arguments); }, - setEnable: function (arg) { - BI.Switcher.superclass.setEnable.apply(this, arguments); - this.switcher && this.switcher.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); - !arg && this._hideView(); + _setEnable: function (arg) { + BI.Switcher.superclass._setEnable.apply(this, arguments); + !arg && this.isViewVisible() && this._hideView(); }, setValue: function (v) { @@ -15281,11 +15259,6 @@ BI.PopupView = BI.inherit(BI.Widget, { this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}) }, - setEnable: function (arg) { - BI.PopupView.superclass.setEnable.apply(this, arguments); - this.view && this.view.setEnable(arg); - }, - setValue: function (selectedValues) { this.tab && this.tab.setValue(selectedValues); this.button_group.setValue(selectedValues); @@ -16092,12 +16065,6 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) { } }, - setEnable: function (b) { - BI.Button.superclass.setEnable.apply(this, arguments); - // this.text.setEnable(b); - // this.icon && this.icon.setEnable(b); - }, - doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, @@ -17470,8 +17437,8 @@ BI.CodeEditor = BI.inherit(BI.Single, { } }, - setEnable: function (b) { - BI.CodeEditor.superclass.setEnable.apply(this, arguments); + _setEnable: function (b) { + BI.CodeEditor.superclass._setEnable.apply(this, arguments); this.editor.setOption("readOnly", b === true ? false : "nocursor") }, @@ -17842,12 +17809,6 @@ BI.Editor = BI.inherit(BI.Single, { isValid: function () { return this.editor.isValid(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); - this.watermark && this.watermark.setEnable(b); } }); BI.Editor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -17950,11 +17911,6 @@ BI.MultifileEditor = BI.inherit(BI.Single, { reset: function () { this.file.reset(); - }, - - setEnable: function (enable) { - BI.MultiFile.superclass.setEnable.apply(this, arguments); - this.file.setEnable(enable); } }); BI.MultifileEditor.EVENT_CHANGE = "MultifileEditor.EVENT_CHANGE"; @@ -18117,12 +18073,6 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { BI.TextAreaEditor.superclass.setValid.apply(this, arguments); this.content.setValid(b); this.watermark && this.watermark.setValid(b); - }, - - setEnable: function (b) { - BI.TextAreaEditor.superclass.setEnable.apply(this, arguments); - this.content.setEnable(b); - this.watermark && this.watermark.setEnable(b); } }); BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -18857,8 +18807,8 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/** this.wrap.attachNum = 0; }, - setEnable: function (enable) { - BI.File.superclass.setEnable.apply(this, arguments); + _setEnable: function (enable) { + BI.File.superclass._setEnable.apply(this, arguments); if (enable === true) { this.element.attr("disabled", "disabled"); } else { @@ -19130,8 +19080,8 @@ BI.Input = BI.inherit(BI.Single, { } }, - setEnable: function (b) { - BI.Input.superclass.setEnable.apply(this, [b]); + _setEnable: function (b) { + BI.Input.superclass._setEnable.apply(this, [b]); this.element[0].disabled = !b; } }); @@ -32563,11 +32513,6 @@ BI.CustomTree = BI.inherit(BI.Widget, { this.initTree(this.options.items); }, - setEnable: function (v) { - BI.CustomTree.superclass.setEnable.apply(this, arguments); - this.tree.setEnable(v) - }, - _formatItems: function (nodes) { var self = this, o = this.options; nodes = BI.Tree.transformToTreeFormat(nodes); diff --git a/docs/case.js b/docs/case.js index 039b4873e..697267ae7 100644 --- a/docs/case.js +++ b/docs/case.js @@ -77,11 +77,6 @@ BI.IconChangeButton = BI.inherit(BI.Single, { this.element.removeClass(o.iconClass).addClass(cls); o.iconClass = cls; } - }, - - setEnable: function (b) { - BI.IconChangeButton.superclass.setEnable.apply(this, arguments); - this.button.setEnable(b); } }); BI.IconChangeButton.EVENT_CHANGE = "IconChangeButton.EVENT_CHANGE"; @@ -197,11 +192,6 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { })))); }, - setEnable: function (v) { - BI.MultiSelectItem.superclass.setEnable.apply(this, arguments); - this.checkbox.setEnable(v); - }, - doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, @@ -2373,10 +2363,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, { return this.combo.isViewVisible(); }, - setEnable: function (v) { - this.combo.setEnable(v) - }, - setValue: function (color) { this.combo.setValue(color); }, @@ -3600,10 +3586,6 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isViewVisible: function () { return this.combo.isViewVisible(); - }, - - setEnable: function (v) { - this.combo.setEnable(!!v); } }); @@ -3799,11 +3781,6 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { this.editorIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.EditorIconCheckCombo.superclass.setEnable.apply(this, arguments); - this.editorIconCheckCombo.setEnable(v); - }, - getValue: function () { return this.trigger.getValue(); }, @@ -4141,11 +4118,6 @@ BI.IconCombo = BI.inherit(BI.Widget, { this.iconCombo.setValue(v); }, - setEnable: function (v) { - BI.IconCombo.superclass.setEnable.apply(this, arguments); - this.iconCombo.setEnable(v); - }, - getValue: function () { return this.iconCombo.getValue(); }, @@ -4431,11 +4403,6 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, { this.textIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.TextValueCheckCombo.superclass.setEnable.apply(this, arguments); - this.textIconCheckCombo.setEnable(v); - }, - setWarningTitle: function (title) { this.trigger.setWarningTitle(title); }, @@ -4503,11 +4470,6 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, { this.SmallTextIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.SmallTextValueCheckCombo.superclass.setEnable.apply(this, arguments); - this.SmallTextIconCheckCombo.setEnable(v); - }, - getValue: function () { return this.SmallTextIconCheckCombo.getValue(); }, @@ -4632,11 +4594,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { this.textIconCombo.setValue(v); }, - setEnable: function (v) { - BI.TextValueCombo.superclass.setEnable.apply(this, arguments); - this.textIconCombo.setEnable(v); - }, - getValue: function () { return this.textIconCombo.getValue(); }, @@ -4702,11 +4659,6 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { this.SmallTextValueCombo.setValue(v); }, - setEnable: function (v) { - BI.SmallTextValueCombo.superclass.setEnable.apply(this, arguments); - this.SmallTextValueCombo.setEnable(v); - }, - getValue: function () { return this.SmallTextValueCombo.getValue(); }, @@ -4840,11 +4792,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { this.trigger.setValue(v.childValue || v.value); }, - setEnable: function (v) { - BI.TextValueDownListCombo.superclass.setEnable.apply(this, arguments); - this.combo.setEnable(v); - }, - getValue: function () { var v = this.combo.getValue()[0]; return [v.childValue || v.value]; @@ -5248,12 +5195,6 @@ BI.SearchEditor = BI.inherit(BI.Widget, { isValid: function () { return this.editor.isValid(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); - this.clear.setEnable(b); } }); BI.SearchEditor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -6186,11 +6127,6 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.editor.setValue(k); }, - setEnable: function (v) { - this.text.setEnable(v); - this.editor.setEnable(v); - }, - getValue: function () { return this.editor.getValue(); }, @@ -6464,11 +6400,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, { this.editor.setValue(k); }, - setEnable: function(v){ - this.text.setEnable(v); - this.editor.setEnable(v); - }, - getValue: function () { return this.editor.getValue(); }, @@ -6666,11 +6597,6 @@ BI.TextEditor = BI.inherit(BI.Widget, { getValue: function () { return this.editor.getValue(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); } }); BI.TextEditor.EVENT_CHANGE = "EVENT_CHANGE"; @@ -8714,10 +8640,6 @@ BI.Segment = BI.inherit(BI.Widget, { this.buttonGroup.setEnabledValue(v); }, - setEnable: function (v) { - this.buttonGroup.setEnable(v); - }, - getValue: function () { return this.buttonGroup.getValue(); } @@ -10452,13 +10374,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { var isAllChecked = this.options.isAllCheckedBySelectedValue.apply(this, arguments); this.setSelected(isAllChecked); !isAllChecked && this.setHalfSelected(this.options.isHalfCheckedBySelectedValue.apply(this, arguments)); - }, - - setEnable: function (b) { - BI.MultiSelectBar.superclass.setEnable.apply(this, arguments); - this.checkbox.setEnable(b); - this.half.setEnable(b); - this.text.setEnable(b); } }); BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE"; @@ -11157,12 +11072,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); }, - setEnable: function (v) { - BI.TextTrigger.superclass.setEnable.apply(this, arguments); - this.trigerButton.setEnable(v); - this.text.setEnable(v); - }, - setValue: function (value) { this.text.setValue(value); this.text.setTitle(value); @@ -11327,12 +11236,6 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, { }); }, - setEnable: function (v) { - BI.SmallTextTrigger.superclass.setEnable.apply(this, arguments); - this.trigerButton.setEnable(v); - this.text.setEnable(v); - }, - setValue: function (value) { this.text.setValue(value); }, diff --git a/docs/core.css b/docs/core.css index 25c5635c6..ed35e8965 100644 --- a/docs/core.css +++ b/docs/core.css @@ -3078,8 +3078,8 @@ i { } .bi-z-index-mask { color: #ffffff; - background-color: rgba(26, 26, 26, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d1a1a1a,endColorstr=#4d1a1a1a); + background-color: rgba(26, 26, 26, 0.5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); } .bi-list-item:hover, .bi-list-item.hover { diff --git a/docs/core.js b/docs/core.js index ff511e204..1715d0032 100644 --- a/docs/core.js +++ b/docs/core.js @@ -14427,17 +14427,18 @@ BI.Widget = BI.inherit(BI.OB, { _initVisualEffects: function () { var o = this.options; if (o.invisible) { - this.element.hide(); + //用display属性做显示和隐藏,否则jquery会在显示时将display设为block会覆盖掉display:flex属性 + this.element.css("display", "none"); } if (o.disabled || o.invalid) { - BI.nextTick(BI.bind(function () { - if (this.options.disabled) { - this.setEnable(false); - } - if (this.options.invalid) { - this.setValid(false); - } - }, this)); + // BI.nextTick(BI.bind(function () { + if (this.options.disabled) { + this.setEnable(false); + } + if (this.options.invalid) { + this.setValid(false); + } + // }, this)); } }, @@ -14485,6 +14486,7 @@ BI.Widget = BI.inherit(BI.OB, { this._isMounted = true; this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { + !self.isEnabled() && widget._setEnable(false); widget._mount && widget._mount(); }); this.mounted && this.mounted(); @@ -14506,12 +14508,23 @@ BI.Widget = BI.inherit(BI.OB, { this._initElementHeight(); }, - setEnable: function (enable) { + _setEnable: function (enable) { if (enable === true) { this.options.disabled = false; - this.element.removeClass("base-disabled disabled"); } else if (enable === false) { this.options.disabled = true; + } + //递归将所有子组件使能 + BI.each(this._children, function (i, child) { + child._setEnable && child._setEnable(enable); + }); + }, + + setEnable: function (enable) { + this._setEnable(enable); + if (enable === true) { + this.element.removeClass("base-disabled disabled"); + } else if (enable === false) { this.element.addClass("base-disabled disabled"); } }, diff --git a/docs/widget.js b/docs/widget.js index 42fb0ced5..9ec134e1a 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -10048,10 +10048,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (arg) { - this.button_group.setEnable(arg); - }, - resetHeight: function (h) { this.button_group.resetHeight(h); }, @@ -10138,10 +10134,6 @@ BI.MultiSelectPopupView = BI.inherit(BI.Widget, { this.popupView.populate.apply(this.popupView, arguments); }, - setEnable: function (arg) { - this.popupView.setEnable(arg); - }, - resetHeight: function (h) { this.popupView.resetHeight(h); }, @@ -10291,10 +10283,6 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { this.numberCounter.setValue(ob); }, - setEnable: function (v) { - this.searcher.setEnable(v); - }, - getKey: function () { return this.searcher.getKey(); }, @@ -10454,10 +10442,6 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (arg) { - this.button_group.setEnable(arg); - }, - resetHeight: function (h) { this.button_group.resetHeight(h); }, @@ -10703,10 +10687,6 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { this.editor.setValue(v); }, - setEnable: function(v){ - this.editor.setEnable(v); - }, - getValue: function () { var v = this.editor.getState(); if (BI.isArray(v) && v.length > 0) { @@ -10866,10 +10846,6 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { return this.searcher.getValue(); }, - setEnable: function (v) { - this.editor.setEnable(v); - }, - populate: function (items) { this.searcher.populate.apply(this.searcher, arguments); } @@ -11267,11 +11243,6 @@ BI.MultiStringList = BI.inherit(BI.Widget, { this.trigger.getSearcher().adjustView(); }, - setEnable: function (v) { - this.trigger.setEnable(v); - this.popup.setEnable(v); - }, - setValue: function (v) { this.storeValue = v || {}; this._assertValue(this.storeValue); @@ -11649,10 +11620,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { this.combo.hideView(); }, - setEnable: function (v) { - this.combo.setEnable(v); - }, - setValue: function (v) { this.storeValue.value = v || {}; this.combo.setValue({ @@ -11752,10 +11719,6 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, { return this.tree.hasChecked(); }, - setEnable: function (arg) { - this.popupView.setEnable(arg); - }, - resetHeight: function (h) { this.popupView.resetHeight(h); }, @@ -12030,10 +11993,6 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { return this.editor.getValue(); }, - setEnable: function(v){ - this.editor.setEnable(v); - }, - getValue: function () { return this.searcher.getValue(); }, @@ -12200,11 +12159,6 @@ BI.MultiTreeList = BI.inherit(BI.Widget, { this.trigger.getSearcher().adjustView(); }, - setEnable: function (v) { - this.trigger.setEnable(v); - this.popup.setEnable(v); - }, - setValue: function (v) { this.storeValue.value = v || {}; this.popup.setValue({ @@ -12704,13 +12658,6 @@ BI.NumericalInterval = BI.inherit(BI.Single, { return this.options.validation === "valid"; }, - setEnable: function (b) { - this.smallEditor.setEnable(b); - this.smallCombo.setEnable(b); - this.bigEditor.setEnable(b); - this.bigCombo.setEnable(b); - }, - setMinEnable: function (b) { this.smallEditor.setEnable(b); }, diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index fae9df972..7a43f7070 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -325,10 +325,8 @@ BI.Combo = BI.inherit(BI.Widget, { this.combo.populate.apply(this.combo, arguments); }, - setEnable: function (arg) { - BI.Combo.superclass.setEnable.apply(this, arguments); - this.combo && this.combo.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); + _setEnable: function (arg) { + BI.Combo.superclass._setEnable.apply(this, arguments); !arg && this.isViewVisible() && this._hideView(); }, diff --git a/src/base/combination/expander.js b/src/base/combination/expander.js index 34a7fa7fe..5bfdb89a1 100644 --- a/src/base/combination/expander.js +++ b/src/base/combination/expander.js @@ -39,7 +39,7 @@ BI.Expander = BI.inherit(BI.Widget, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Expander.EVENT_EXPAND); } - if(type === BI.Events.COLLAPSE) { + if (type === BI.Events.COLLAPSE) { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Expander.EVENT_COLLAPSE); } @@ -196,11 +196,9 @@ BI.Expander = BI.inherit(BI.Widget, { this.expander.populate.apply(this.expander, arguments); }, - setEnable: function (arg) { - BI.Expander.superclass.setEnable.apply(this, arguments); - this.expander && this.expander.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); - !arg && this._hideView(); + _setEnable: function (arg) { + BI.Expander.superclass._setEnable.apply(this, arguments); + !arg && this.isViewVisible() && this._hideView(); }, setValue: function (v) { diff --git a/src/base/combination/group.button.js b/src/base/combination/group.button.js index 2da4ee7fd..76be065fb 100644 --- a/src/base/combination/group.button.js +++ b/src/base/combination/group.button.js @@ -189,13 +189,6 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { this.layouts = BI.createWidget(BI.extend({element: this}, this._packageLayout(items))); }, - setEnable: function (b) { - BI.ButtonGroup.superclass.setEnable.apply(this, arguments); - BI.each(this.buttons, function (i, item) { - item.setEnable(b); - }); - }, - setNotSelectedValue: function (v) { v = BI.isArray(v) ? v : [v]; BI.each(this.buttons, function (i, item) { diff --git a/src/base/combination/group.combo.js b/src/base/combination/group.combo.js index 2d3314fd3..19339f13f 100644 --- a/src/base/combination/group.combo.js +++ b/src/base/combination/group.combo.js @@ -83,11 +83,6 @@ BI.ComboGroup = BI.inherit(BI.Widget, { }) }, - setEnable: function (b) { - BI.ComboGroup.superclass.setEnable.apply(this, arguments); - this.combo && this.combo.setEnable(b); - }, - getValue: function () { return this.combo.getValue(); }, diff --git a/src/base/combination/loader.js b/src/base/combination/loader.js index 50ecdc3ff..ee25cd4ae 100644 --- a/src/base/combination/loader.js +++ b/src/base/combination/loader.js @@ -195,10 +195,6 @@ BI.Loader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (v) { - this.button_group.setEnable(v); - }, - doBehavior: function () { this.button_group.doBehavior.apply(this.button_group, arguments); }, diff --git a/src/base/combination/switcher.js b/src/base/combination/switcher.js index c72715b63..f279eaabb 100644 --- a/src/base/combination/switcher.js +++ b/src/base/combination/switcher.js @@ -186,11 +186,9 @@ BI.Switcher = BI.inherit(BI.Widget, { this.switcher.populate.apply(this.switcher, arguments); }, - setEnable: function (arg) { - BI.Switcher.superclass.setEnable.apply(this, arguments); - this.switcher && this.switcher.setEnable(arg); - this.popupView && this.popupView.setEnable(arg); - !arg && this._hideView(); + _setEnable: function (arg) { + BI.Switcher.superclass._setEnable.apply(this, arguments); + !arg && this.isViewVisible() && this._hideView(); }, setValue: function (v) { diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index 2f86dad9a..1af212577 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -158,11 +158,6 @@ BI.PopupView = BI.inherit(BI.Widget, { this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}) }, - setEnable: function (arg) { - BI.PopupView.superclass.setEnable.apply(this, arguments); - this.view && this.view.setEnable(arg); - }, - setValue: function (selectedValues) { this.tab && this.tab.setValue(selectedValues); this.button_group.setValue(selectedValues); diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js index 19aa8075d..c35cbb5f7 100644 --- a/src/base/single/button/button.basic.js +++ b/src/base/single/button/button.basic.js @@ -298,8 +298,8 @@ BI.BasicButton = BI.inherit(BI.Single, { return this.options.text; }, - setEnable: function (b) { - BI.BasicButton.superclass.setEnable.apply(this, arguments); + _setEnable: function (b) { + BI.BasicButton.superclass._setEnable.apply(this, arguments); if (!b) { if (this.options.shadow) { this.$mask && this.$mask.setVisible(false); diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 51854f5c2..9e02af048 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -119,12 +119,6 @@ } }, - setEnable: function (b) { - BI.Button.superclass.setEnable.apply(this, arguments); - // this.text.setEnable(b); - // this.icon && this.icon.setEnable(b); - }, - doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, diff --git a/src/base/single/editor/editor.code.js b/src/base/single/editor/editor.code.js index e8beba8c8..3a8292d0c 100644 --- a/src/base/single/editor/editor.code.js +++ b/src/base/single/editor/editor.code.js @@ -76,8 +76,8 @@ BI.CodeEditor = BI.inherit(BI.Single, { } }, - setEnable: function (b) { - BI.CodeEditor.superclass.setEnable.apply(this, arguments); + _setEnable: function (b) { + BI.CodeEditor.superclass._setEnable.apply(this, arguments); this.editor.setOption("readOnly", b === true ? false : "nocursor") }, diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index 44b7781ec..b352506e2 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -303,12 +303,6 @@ BI.Editor = BI.inherit(BI.Single, { isValid: function () { return this.editor.isValid(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); - this.watermark && this.watermark.setEnable(b); } }); BI.Editor.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/base/single/editor/editor.multifile.js b/src/base/single/editor/editor.multifile.js index b2823a2f1..dd25c7c0e 100644 --- a/src/base/single/editor/editor.multifile.js +++ b/src/base/single/editor/editor.multifile.js @@ -79,11 +79,6 @@ BI.MultifileEditor = BI.inherit(BI.Single, { reset: function () { this.file.reset(); - }, - - setEnable: function (enable) { - BI.MultiFile.superclass.setEnable.apply(this, arguments); - this.file.setEnable(enable); } }); BI.MultifileEditor.EVENT_CHANGE = "MultifileEditor.EVENT_CHANGE"; diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js index daa12f8a8..15c6bc7a1 100644 --- a/src/base/single/editor/editor.textarea.js +++ b/src/base/single/editor/editor.textarea.js @@ -153,12 +153,6 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { BI.TextAreaEditor.superclass.setValid.apply(this, arguments); this.content.setValid(b); this.watermark && this.watermark.setValid(b); - }, - - setEnable: function (b) { - BI.TextAreaEditor.superclass.setEnable.apply(this, arguments); - this.content.setEnable(b); - this.watermark && this.watermark.setEnable(b); } }); BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index 6dc191f1a..8b4d57a11 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -601,8 +601,8 @@ this.wrap.attachNum = 0; }, - setEnable: function (enable) { - BI.File.superclass.setEnable.apply(this, arguments); + _setEnable: function (enable) { + BI.File.superclass._setEnable.apply(this, arguments); if (enable === true) { this.element.attr("disabled", "disabled"); } else { diff --git a/src/base/single/input/input.js b/src/base/single/input/input.js index af92d1ca4..06d59168e 100644 --- a/src/base/single/input/input.js +++ b/src/base/single/input/input.js @@ -256,8 +256,8 @@ BI.Input = BI.inherit(BI.Single, { } }, - setEnable: function (b) { - BI.Input.superclass.setEnable.apply(this, [b]); + _setEnable: function (b) { + BI.Input.superclass._setEnable.apply(this, [b]); this.element[0].disabled = !b; } }); diff --git a/src/base/tree/customtree.js b/src/base/tree/customtree.js index 22e71e64a..1d5342ae8 100644 --- a/src/base/tree/customtree.js +++ b/src/base/tree/customtree.js @@ -35,11 +35,6 @@ BI.CustomTree = BI.inherit(BI.Widget, { this.initTree(this.options.items); }, - setEnable: function (v) { - BI.CustomTree.superclass.setEnable.apply(this, arguments); - this.tree.setEnable(v) - }, - _formatItems: function (nodes) { var self = this, o = this.options; nodes = BI.Tree.transformToTreeFormat(nodes); diff --git a/src/case/button/icon/icon.change.js b/src/case/button/icon/icon.change.js index 2511072e5..69c050fdb 100644 --- a/src/case/button/icon/icon.change.js +++ b/src/case/button/icon/icon.change.js @@ -77,11 +77,6 @@ BI.IconChangeButton = BI.inherit(BI.Single, { this.element.removeClass(o.iconClass).addClass(cls); o.iconClass = cls; } - }, - - setEnable: function (b) { - BI.IconChangeButton.superclass.setEnable.apply(this, arguments); - this.button.setEnable(b); } }); BI.IconChangeButton.EVENT_CHANGE = "IconChangeButton.EVENT_CHANGE"; diff --git a/src/case/button/item.multiselect.js b/src/case/button/item.multiselect.js index b7b7eed42..5a6ac2042 100644 --- a/src/case/button/item.multiselect.js +++ b/src/case/button/item.multiselect.js @@ -50,11 +50,6 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { })))); }, - setEnable: function (v) { - BI.MultiSelectItem.superclass.setEnable.apply(this, arguments); - this.checkbox.setEnable(v); - }, - doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index 302a54fb7..af97fa954 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -70,10 +70,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, { return this.combo.isViewVisible(); }, - setEnable: function (v) { - this.combo.setEnable(v) - }, - setValue: function (color) { this.combo.setValue(color); }, diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index 023872a57..8801475f2 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -201,10 +201,6 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isViewVisible: function () { return this.combo.isViewVisible(); - }, - - setEnable: function (v) { - this.combo.setEnable(!!v); } }); diff --git a/src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js b/src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js index 1dc525960..39c5bb11e 100644 --- a/src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js +++ b/src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js @@ -62,11 +62,6 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { this.editorIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.EditorIconCheckCombo.superclass.setEnable.apply(this, arguments); - this.editorIconCheckCombo.setEnable(v); - }, - getValue: function () { return this.trigger.getValue(); }, diff --git a/src/case/combo/iconcombo/combo.icon.js b/src/case/combo/iconcombo/combo.icon.js index 74ddacdc5..75666fc6c 100644 --- a/src/case/combo/iconcombo/combo.icon.js +++ b/src/case/combo/iconcombo/combo.icon.js @@ -81,11 +81,6 @@ BI.IconCombo = BI.inherit(BI.Widget, { this.iconCombo.setValue(v); }, - setEnable: function (v) { - BI.IconCombo.superclass.setEnable.apply(this, arguments); - this.iconCombo.setEnable(v); - }, - getValue: function () { return this.iconCombo.getValue(); }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js index 352c6be78..47608a8ca 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js @@ -56,11 +56,6 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, { this.textIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.TextValueCheckCombo.superclass.setEnable.apply(this, arguments); - this.textIconCheckCombo.setEnable(v); - }, - setWarningTitle: function (title) { this.trigger.setWarningTitle(title); }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js b/src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js index 0de03ef9e..a5bcdcaa6 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js +++ b/src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js @@ -51,11 +51,6 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, { this.SmallTextIconCheckCombo.setValue(v); }, - setEnable: function (v) { - BI.SmallTextValueCheckCombo.superclass.setEnable.apply(this, arguments); - this.SmallTextIconCheckCombo.setEnable(v); - }, - getValue: function () { return this.SmallTextIconCheckCombo.getValue(); }, diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 53e7c9594..3e58873df 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -53,11 +53,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { this.textIconCombo.setValue(v); }, - setEnable: function (v) { - BI.TextValueCombo.superclass.setEnable.apply(this, arguments); - this.textIconCombo.setEnable(v); - }, - getValue: function () { return this.textIconCombo.getValue(); }, diff --git a/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/src/case/combo/textvaluecombo/combo.textvaluesmall.js index 54e6a9cce..3a6c86057 100644 --- a/src/case/combo/textvaluecombo/combo.textvaluesmall.js +++ b/src/case/combo/textvaluecombo/combo.textvaluesmall.js @@ -53,11 +53,6 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { this.SmallTextValueCombo.setValue(v); }, - setEnable: function (v) { - BI.SmallTextValueCombo.superclass.setEnable.apply(this, arguments); - this.SmallTextValueCombo.setEnable(v); - }, - getValue: function () { return this.SmallTextValueCombo.getValue(); }, diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index 95247087b..94c69b8d0 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -64,11 +64,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { this.trigger.setValue(v.childValue || v.value); }, - setEnable: function (v) { - BI.TextValueDownListCombo.superclass.setEnable.apply(this, arguments); - this.combo.setEnable(v); - }, - getValue: function () { var v = this.combo.getValue()[0]; return [v.childValue || v.value]; diff --git a/src/case/editor/editor.search.js b/src/case/editor/editor.search.js index f4f5218eb..1cad5eb31 100644 --- a/src/case/editor/editor.search.js +++ b/src/case/editor/editor.search.js @@ -168,12 +168,6 @@ BI.SearchEditor = BI.inherit(BI.Widget, { isValid: function () { return this.editor.isValid(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); - this.clear.setEnable(b); } }); BI.SearchEditor.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js index 129bd274b..8156f3344 100644 --- a/src/case/editor/editor.state.js +++ b/src/case/editor/editor.state.js @@ -201,11 +201,6 @@ BI.StateEditor = BI.inherit(BI.Widget, { this.editor.setValue(k); }, - setEnable: function (v) { - this.text.setEnable(v); - this.editor.setEnable(v); - }, - getValue: function () { return this.editor.getValue(); }, diff --git a/src/case/editor/editor.state.simple.js b/src/case/editor/editor.state.simple.js index f343a8cda..2d89d53ca 100644 --- a/src/case/editor/editor.state.simple.js +++ b/src/case/editor/editor.state.simple.js @@ -199,11 +199,6 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, { this.editor.setValue(k); }, - setEnable: function(v){ - this.text.setEnable(v); - this.editor.setEnable(v); - }, - getValue: function () { return this.editor.getValue(); }, diff --git a/src/case/editor/editor.text.js b/src/case/editor/editor.text.js index ad8cc8789..d610ab1c2 100644 --- a/src/case/editor/editor.text.js +++ b/src/case/editor/editor.text.js @@ -141,11 +141,6 @@ BI.TextEditor = BI.inherit(BI.Widget, { getValue: function () { return this.editor.getValue(); - }, - - setEnable: function (b) { - BI.Editor.superclass.setEnable.apply(this, arguments); - this.editor && this.editor.setEnable(b); } }); BI.TextEditor.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js index 0979baaa0..7a8f1fad0 100644 --- a/src/case/segment/segment.js +++ b/src/case/segment/segment.js @@ -46,10 +46,6 @@ BI.Segment = BI.inherit(BI.Widget, { this.buttonGroup.setEnabledValue(v); }, - setEnable: function (v) { - this.buttonGroup.setEnable(v); - }, - getValue: function () { return this.buttonGroup.getValue(); } diff --git a/src/case/toolbar/toolbar.multiselect.js b/src/case/toolbar/toolbar.multiselect.js index 262167d24..78c4b049b 100644 --- a/src/case/toolbar/toolbar.multiselect.js +++ b/src/case/toolbar/toolbar.multiselect.js @@ -121,13 +121,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { var isAllChecked = this.options.isAllCheckedBySelectedValue.apply(this, arguments); this.setSelected(isAllChecked); !isAllChecked && this.setHalfSelected(this.options.isHalfCheckedBySelectedValue.apply(this, arguments)); - }, - - setEnable: function (b) { - BI.MultiSelectBar.superclass.setEnable.apply(this, arguments); - this.checkbox.setEnable(b); - this.half.setEnable(b); - this.text.setEnable(b); } }); BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE"; diff --git a/src/case/trigger/trigger.text.js b/src/case/trigger/trigger.text.js index 91b73742c..46681eba9 100644 --- a/src/case/trigger/trigger.text.js +++ b/src/case/trigger/trigger.text.js @@ -48,12 +48,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { }); }, - setEnable: function (v) { - BI.TextTrigger.superclass.setEnable.apply(this, arguments); - this.trigerButton.setEnable(v); - this.text.setEnable(v); - }, - setValue: function (value) { this.text.setValue(value); this.text.setTitle(value); diff --git a/src/case/trigger/trigger.text.small.js b/src/case/trigger/trigger.text.small.js index b524e9a6a..3fb1c39fe 100644 --- a/src/case/trigger/trigger.text.small.js +++ b/src/case/trigger/trigger.text.small.js @@ -47,12 +47,6 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, { }); }, - setEnable: function (v) { - BI.SmallTextTrigger.superclass.setEnable.apply(this, arguments); - this.trigerButton.setEnable(v); - this.text.setEnable(v); - }, - setValue: function (value) { this.text.setValue(value); }, diff --git a/src/core/widget.js b/src/core/widget.js index 2ba806a87..83e63c84d 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -105,17 +105,18 @@ BI.Widget = BI.inherit(BI.OB, { _initVisualEffects: function () { var o = this.options; if (o.invisible) { - this.element.hide(); + //用display属性做显示和隐藏,否则jquery会在显示时将display设为block会覆盖掉display:flex属性 + this.element.css("display", "none"); } if (o.disabled || o.invalid) { - BI.nextTick(BI.bind(function () { - if (this.options.disabled) { - this.setEnable(false); - } - if (this.options.invalid) { - this.setValid(false); - } - }, this)); + // BI.nextTick(BI.bind(function () { + if (this.options.disabled) { + this.setEnable(false); + } + if (this.options.invalid) { + this.setValid(false); + } + // }, this)); } }, @@ -163,6 +164,7 @@ BI.Widget = BI.inherit(BI.OB, { this._isMounted = true; this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { + !self.isEnabled() && widget._setEnable(false); widget._mount && widget._mount(); }); this.mounted && this.mounted(); @@ -184,12 +186,23 @@ BI.Widget = BI.inherit(BI.OB, { this._initElementHeight(); }, - setEnable: function (enable) { + _setEnable: function (enable) { if (enable === true) { this.options.disabled = false; - this.element.removeClass("base-disabled disabled"); } else if (enable === false) { this.options.disabled = true; + } + //递归将所有子组件使能 + BI.each(this._children, function (i, child) { + child._setEnable && child._setEnable(enable); + }); + }, + + setEnable: function (enable) { + this._setEnable(enable); + if (enable === true) { + this.element.removeClass("base-disabled disabled"); + } else if (enable === false) { this.element.addClass("base-disabled disabled"); } }, diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index fb4f4a575..23ca02db3 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -125,8 +125,8 @@ } .bi-z-index-mask { color: #ffffff; - background-color: rgba(26, 26, 26, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d1a1a1a,endColorstr=#4d1a1a1a); + background-color: rgba(26, 26, 26, 0.5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); } .bi-list-item:hover, .bi-list-item.hover { diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 221796870..6537c9d8e 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -175,7 +175,7 @@ .bi-z-index-mask { color: @color-bi-background-default; - .background-color(@color-bi-background-black, 30%); + .background-color(@color-bi-background-black, 50%); } //只有背景变化 diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index a6ccffdd6..febe15800 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -155,10 +155,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (arg) { - this.button_group.setEnable(arg); - }, - resetHeight: function (h) { this.button_group.resetHeight(h); }, diff --git a/src/widget/multiselect/multiselect.popup.view.js b/src/widget/multiselect/multiselect.popup.view.js index ef9789f6b..cfbd6aca1 100644 --- a/src/widget/multiselect/multiselect.popup.view.js +++ b/src/widget/multiselect/multiselect.popup.view.js @@ -74,10 +74,6 @@ BI.MultiSelectPopupView = BI.inherit(BI.Widget, { this.popupView.populate.apply(this.popupView, arguments); }, - setEnable: function (arg) { - this.popupView.setEnable(arg); - }, - resetHeight: function (h) { this.popupView.resetHeight(h); }, diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index e9a1dda38..0da496a64 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/src/widget/multiselect/multiselect.trigger.js @@ -133,10 +133,6 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { this.numberCounter.setValue(ob); }, - setEnable: function (v) { - this.searcher.setEnable(v); - }, - getKey: function () { return this.searcher.getKey(); }, diff --git a/src/widget/multiselect/search/multiselect.search.loader.js b/src/widget/multiselect/search/multiselect.search.loader.js index d901487e3..20c74c61a 100644 --- a/src/widget/multiselect/search/multiselect.search.loader.js +++ b/src/widget/multiselect/search/multiselect.search.loader.js @@ -139,10 +139,6 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { this.button_group.populate.apply(this.button_group, arguments); }, - setEnable: function (arg) { - this.button_group.setEnable(arg); - }, - resetHeight: function (h) { this.button_group.resetHeight(h); }, diff --git a/src/widget/multiselect/trigger/editor.multiselect.js b/src/widget/multiselect/trigger/editor.multiselect.js index 5d35a3a79..368509fa4 100644 --- a/src/widget/multiselect/trigger/editor.multiselect.js +++ b/src/widget/multiselect/trigger/editor.multiselect.js @@ -56,10 +56,6 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { this.editor.setValue(v); }, - setEnable: function(v){ - this.editor.setEnable(v); - }, - getValue: function () { var v = this.editor.getState(); if (BI.isArray(v) && v.length > 0) { diff --git a/src/widget/multiselect/trigger/searcher.multiselect.js b/src/widget/multiselect/trigger/searcher.multiselect.js index 337749a6e..166b79117 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.js @@ -134,10 +134,6 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { return this.searcher.getValue(); }, - setEnable: function (v) { - this.editor.setEnable(v); - }, - populate: function (items) { this.searcher.populate.apply(this.searcher, arguments); } diff --git a/src/widget/multistringlist/multistringlist.js b/src/widget/multistringlist/multistringlist.js index c9f39b780..5ca269679 100644 --- a/src/widget/multistringlist/multistringlist.js +++ b/src/widget/multistringlist/multistringlist.js @@ -287,11 +287,6 @@ BI.MultiStringList = BI.inherit(BI.Widget, { this.trigger.getSearcher().adjustView(); }, - setEnable: function (v) { - this.trigger.setEnable(v); - this.popup.setEnable(v); - }, - setValue: function (v) { this.storeValue = v || {}; this._assertValue(this.storeValue); diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 7c302e9cd..d2bd72edf 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -236,10 +236,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { this.combo.hideView(); }, - setEnable: function (v) { - this.combo.setEnable(v); - }, - setValue: function (v) { this.storeValue.value = v || {}; this.combo.setValue({ diff --git a/src/widget/multitree/multi.tree.popup.js b/src/widget/multitree/multi.tree.popup.js index 542a339b6..e8c5cded0 100644 --- a/src/widget/multitree/multi.tree.popup.js +++ b/src/widget/multitree/multi.tree.popup.js @@ -79,10 +79,6 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, { return this.tree.hasChecked(); }, - setEnable: function (arg) { - this.popupView.setEnable(arg); - }, - resetHeight: function (h) { this.popupView.resetHeight(h); }, diff --git a/src/widget/multitree/trigger/searcher.multi.tree.js b/src/widget/multitree/trigger/searcher.multi.tree.js index 5c07c576c..e63eed7cb 100644 --- a/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.multi.tree.js @@ -119,10 +119,6 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { return this.editor.getValue(); }, - setEnable: function(v){ - this.editor.setEnable(v); - }, - getValue: function () { return this.searcher.getValue(); }, diff --git a/src/widget/multitreelist/multitreelist.js b/src/widget/multitreelist/multitreelist.js index d530e2045..52182c0dc 100644 --- a/src/widget/multitreelist/multitreelist.js +++ b/src/widget/multitreelist/multitreelist.js @@ -150,11 +150,6 @@ BI.MultiTreeList = BI.inherit(BI.Widget, { this.trigger.getSearcher().adjustView(); }, - setEnable: function (v) { - this.trigger.setEnable(v); - this.popup.setEnable(v); - }, - setValue: function (v) { this.storeValue.value = v || {}; this.popup.setValue({ diff --git a/src/widget/numericalinterval/numericalinterval.js b/src/widget/numericalinterval/numericalinterval.js index e02ed03b5..f7231708d 100644 --- a/src/widget/numericalinterval/numericalinterval.js +++ b/src/widget/numericalinterval/numericalinterval.js @@ -430,13 +430,6 @@ BI.NumericalInterval = BI.inherit(BI.Single, { return this.options.validation === "valid"; }, - setEnable: function (b) { - this.smallEditor.setEnable(b); - this.smallCombo.setEnable(b); - this.bigEditor.setEnable(b); - this.bigCombo.setEnable(b); - }, - setMinEnable: function (b) { this.smallEditor.setEnable(b); },