diff --git a/bi/base.js b/bi/base.js index aea1b5f03..0077aef3b 100644 --- a/bi/base.js +++ b/bi/base.js @@ -3997,7 +3997,7 @@ BI.Navigation = BI.inherit(BI.Widget, { }, setSelect: function (v) { - this._assertCard(); + this._assertCard(v); this.layout.showCardByName(v); this._deleteOtherCards(v); if (this.showIndex !== v) { diff --git a/bi/core.css b/bi/core.css index 5044d7d89..317fa4d81 100644 --- a/bi/core.css +++ b/bi/core.css @@ -1,3 +1,54 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +html, +body, +div, +ul, +li, +img, +a, +span, +p, +* { + margin: 0; + padding: 0; +} +a { + outline: none; + text-decoration: none; +} +a:focus { + outline: 0; +} +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid #d4dadd; +} +.bi-theme-dark input, +.bi-theme-dark textarea { + border: 1px solid #525466; +} +ul, +ol { + margin: 0; + padding: 0; +} +ul { + list-style: disc; +} +li { + list-style-type: none; +} +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} @charset "UTF-8"; /*! * animate.css -http://daneden.me/animate @@ -3027,6 +3078,11 @@ background-color: transparent !important; color: #cccccc !important; } +.bi-list-item.disabled .bi-high-light, +.bi-list-item.disabled:hover .bi-high-light, +.bi-list-item.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item:hover, .bi-theme-dark .bi-list-item.hover { background-color: #191b2b; @@ -3038,6 +3094,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item.disabled .bi-high-light, +.bi-theme-dark .bi-list-item.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-simple:hover, .bi-list-item-simple.hover { color: #1a1a1a; @@ -3047,6 +3108,11 @@ .bi-list-item-simple.disabled:active { color: #cccccc !important; } +.bi-list-item-simple.disabled .bi-high-light, +.bi-list-item-simple.disabled:hover .bi-high-light, +.bi-list-item-simple.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-simple:hover, .bi-theme-dark .bi-list-item-simple.hover { color: #ffffff; @@ -3056,6 +3122,11 @@ .bi-theme-dark .bi-list-item-simple.disabled:active { color: #666666 !important; } +.bi-theme-dark .bi-list-item-simple.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-simple.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-simple.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-effect:hover { color: #1a1a1a; } @@ -3068,6 +3139,11 @@ .bi-list-item-effect.disabled:active { color: #cccccc !important; } +.bi-list-item-effect.disabled .bi-high-light, +.bi-list-item-effect.disabled:hover .bi-high-light, +.bi-list-item-effect.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-effect:hover { color: #ffffff; } @@ -3081,6 +3157,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-effect.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-effect.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-effect.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-hover:hover, .bi-list-item-hover.hover { color: #3f8ce8; @@ -3092,6 +3173,11 @@ color: #cccccc !important; background-color: transparent !important; } +.bi-list-item-hover.disabled .bi-high-light, +.bi-list-item-hover.disabled:hover .bi-high-light, +.bi-list-item-hover.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-hover:hover, .bi-theme-dark .bi-list-item-hover.hover { color: #3f8ce8; @@ -3103,6 +3189,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-hover.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-hover.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-hover.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-active:hover, .bi-list-item-active.hover { color: #1a1a1a; @@ -3119,6 +3210,11 @@ background-color: transparent !important; color: #cccccc !important; } +.bi-list-item-active.disabled .bi-high-light, +.bi-list-item-active.disabled:hover .bi-high-light, +.bi-list-item-active.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-active:hover, .bi-theme-dark .bi-list-item-active.hover { background-color: #191b2b; @@ -3135,6 +3231,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-active.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-active.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-select:hover, .bi-list-item-select.hover { color: #3f8ce8; @@ -3163,7 +3264,7 @@ .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #3f8ce8; - background-color: #eff1f4; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-select:active, .bi-theme-dark .bi-list-item-select.active { @@ -3185,6 +3286,26 @@ .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { color: #666666 !important; } +.bi-list-item-choose:active, +.bi-list-item-choose.active { + color: #ffffff; + background-color: #3f8ce8; +} +.bi-list-item-choose:active .bi-high-light, +.bi-list-item-choose.active .bi-high-light { + color: #ffffff; +} +.bi-list-item-choose.disabled, +.bi-list-item-choose.disabled:hover, +.bi-list-item-choose.disabled:active { + color: #cccccc !important; + background-color: transparent !important; +} +.bi-list-item-choose.disabled .bi-high-light, +.bi-list-item-choose.disabled:hover .bi-high-light, +.bi-list-item-choose.disabled:active .bi-high-light { + color: #cccccc !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; diff --git a/bi/core.js b/bi/core.js index 0a23cd165..0c0d0099b 100644 --- a/bi/core.js +++ b/bi/core.js @@ -15926,9 +15926,7 @@ BI.LayerController = BI.inherit(BI.Controller, { */ BI.MaskersController = BI.inherit(BI.LayerController, { _defaultConfig: function () { - return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), { - render: "body" - }); + return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), {}); }, _init: function () { diff --git a/bi/widget.css b/bi/widget.css index df905928d..93cd3ac5e 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -44,9 +44,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement-droppable { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); z-index: 100000; } /****添加计算宽度的--运算符直接需要space****/ @@ -118,9 +115,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-date-picker { - background: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -170,7 +164,6 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; - background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #eff1f4; @@ -179,9 +172,6 @@ .bi-file-manager-nav-button .file-manager-nav-button-triangle { z-index: 1; } -.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text { - background: #242640; -} .bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #191b2b; color: #999999; diff --git a/bi/widget.js b/bi/widget.js index bfce10a76..1a44714db 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -4526,7 +4526,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-date-picker", + baseCls: "bi-date-picker bi-background", height: 25, min: '1900-01-01', //最小日期 max: '2099-12-31' //最大日期 @@ -7121,70 +7121,6 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); BI.FineTuningNumberEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.shortcut("bi.fine_tuning_number_editor", BI.FineTuningNumberEditor);/** - * Created by GameJian on 2016/1/28. - */ -BI.ImageButtonHref = BI.inherit(BI.Single, { - - _defaultConfig: function () { - return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-image-button-href", - title: BI.i18nText("BI-Add_Href") - }) - }, - - _init: function () { - BI.ImageButtonHref.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.trigger = BI.createWidget({ - type: "bi.icon_button", - cls: "img-href-font", - title: o.title, - height: 24, - width: 24 - }); - - this.input = BI.createWidget({ - type: "bi.clear_editor", - watermark: BI.i18nText("BI-Input_Href"), - width: 255, - height: 30 - }); - this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { - self.combo.hideView(); - }); - - this.combo = BI.createWidget({ - type: "bi.combo", - element: this, - direction: "bottom,left", - adjustYOffset: 3, - el: this.trigger, - popup: { - el: this.input, - stopPropagation: false, - minWidth: 255 - } - }); - - this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { - self.input.focus() - }); - - this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { - self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) - }) - }, - - getValue: function () { - return this.input.getValue(); - }, - - setValue: function (url) { - this.input.setValue(url) - } -}); -BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; -BI.shortcut("bi.image_button_href", BI.ImageButtonHref);/** * 交互行为布局 * * diff --git a/demo/js/face.js b/demo/js/face.js index 63afbcd0a..09e94e9cd 100644 --- a/demo/js/face.js +++ b/demo/js/face.js @@ -563,15 +563,15 @@ Demo.Face = BI.inherit(BI.Widget, { var maskBackgroundColor = this.maskBackgroundColor.getValue(); this._setStyle({ - ".bi-background": { - "background-color": backgroundColor + "!important", - "color": fontColor + "!important" + "#wrapper.bi-background, #wrapper .bi-background": { + "background-color": backgroundColor, + "color": fontColor }, - ".bi-card": { - "background-color": cardBackgroundColor + "!important" + "#wrapper .bi-card": { + "background-color": cardBackgroundColor }, - ".bi-tips": { - "color": grayFontColor + "!important" + "#wrapper .bi-tips": { + "color": grayFontColor }, "div::-webkit-scrollbar,.scrollbar-layout-main": { "background-color": scrollBackgroundColor + "!important" diff --git a/docs/base.js b/docs/base.js index aea1b5f03..0077aef3b 100644 --- a/docs/base.js +++ b/docs/base.js @@ -3997,7 +3997,7 @@ BI.Navigation = BI.inherit(BI.Widget, { }, setSelect: function (v) { - this._assertCard(); + this._assertCard(v); this.layout.showCardByName(v); this._deleteOtherCards(v); if (this.showIndex !== v) { diff --git a/docs/core.css b/docs/core.css index 5044d7d89..317fa4d81 100644 --- a/docs/core.css +++ b/docs/core.css @@ -1,3 +1,54 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +html, +body, +div, +ul, +li, +img, +a, +span, +p, +* { + margin: 0; + padding: 0; +} +a { + outline: none; + text-decoration: none; +} +a:focus { + outline: 0; +} +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid #d4dadd; +} +.bi-theme-dark input, +.bi-theme-dark textarea { + border: 1px solid #525466; +} +ul, +ol { + margin: 0; + padding: 0; +} +ul { + list-style: disc; +} +li { + list-style-type: none; +} +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} @charset "UTF-8"; /*! * animate.css -http://daneden.me/animate @@ -3027,6 +3078,11 @@ background-color: transparent !important; color: #cccccc !important; } +.bi-list-item.disabled .bi-high-light, +.bi-list-item.disabled:hover .bi-high-light, +.bi-list-item.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item:hover, .bi-theme-dark .bi-list-item.hover { background-color: #191b2b; @@ -3038,6 +3094,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item.disabled .bi-high-light, +.bi-theme-dark .bi-list-item.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-simple:hover, .bi-list-item-simple.hover { color: #1a1a1a; @@ -3047,6 +3108,11 @@ .bi-list-item-simple.disabled:active { color: #cccccc !important; } +.bi-list-item-simple.disabled .bi-high-light, +.bi-list-item-simple.disabled:hover .bi-high-light, +.bi-list-item-simple.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-simple:hover, .bi-theme-dark .bi-list-item-simple.hover { color: #ffffff; @@ -3056,6 +3122,11 @@ .bi-theme-dark .bi-list-item-simple.disabled:active { color: #666666 !important; } +.bi-theme-dark .bi-list-item-simple.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-simple.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-simple.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-effect:hover { color: #1a1a1a; } @@ -3068,6 +3139,11 @@ .bi-list-item-effect.disabled:active { color: #cccccc !important; } +.bi-list-item-effect.disabled .bi-high-light, +.bi-list-item-effect.disabled:hover .bi-high-light, +.bi-list-item-effect.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-effect:hover { color: #ffffff; } @@ -3081,6 +3157,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-effect.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-effect.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-effect.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-hover:hover, .bi-list-item-hover.hover { color: #3f8ce8; @@ -3092,6 +3173,11 @@ color: #cccccc !important; background-color: transparent !important; } +.bi-list-item-hover.disabled .bi-high-light, +.bi-list-item-hover.disabled:hover .bi-high-light, +.bi-list-item-hover.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-hover:hover, .bi-theme-dark .bi-list-item-hover.hover { color: #3f8ce8; @@ -3103,6 +3189,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-hover.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-hover.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-hover.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-active:hover, .bi-list-item-active.hover { color: #1a1a1a; @@ -3119,6 +3210,11 @@ background-color: transparent !important; color: #cccccc !important; } +.bi-list-item-active.disabled .bi-high-light, +.bi-list-item-active.disabled:hover .bi-high-light, +.bi-list-item-active.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-active:hover, .bi-theme-dark .bi-list-item-active.hover { background-color: #191b2b; @@ -3135,6 +3231,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-active.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-active.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-select:hover, .bi-list-item-select.hover { color: #3f8ce8; @@ -3163,7 +3264,7 @@ .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #3f8ce8; - background-color: #eff1f4; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-select:active, .bi-theme-dark .bi-list-item-select.active { @@ -3185,6 +3286,26 @@ .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { color: #666666 !important; } +.bi-list-item-choose:active, +.bi-list-item-choose.active { + color: #ffffff; + background-color: #3f8ce8; +} +.bi-list-item-choose:active .bi-high-light, +.bi-list-item-choose.active .bi-high-light { + color: #ffffff; +} +.bi-list-item-choose.disabled, +.bi-list-item-choose.disabled:hover, +.bi-list-item-choose.disabled:active { + color: #cccccc !important; + background-color: transparent !important; +} +.bi-list-item-choose.disabled .bi-high-light, +.bi-list-item-choose.disabled:hover .bi-high-light, +.bi-list-item-choose.disabled:active .bi-high-light { + color: #cccccc !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; diff --git a/docs/core.js b/docs/core.js index 10dbadaf8..8a85d1efa 100644 --- a/docs/core.js +++ b/docs/core.js @@ -21125,9 +21125,7 @@ BI.LayerController = BI.inherit(BI.Controller, { */ BI.MaskersController = BI.inherit(BI.LayerController, { _defaultConfig: function () { - return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), { - render: "body" - }); + return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), {}); }, _init: function () { diff --git a/docs/demo.js b/docs/demo.js index b191d9538..b91d3b6be 100644 --- a/docs/demo.js +++ b/docs/demo.js @@ -5083,15 +5083,15 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var maskBackgroundColor = this.maskBackgroundColor.getValue(); this._setStyle({ - ".bi-background": { - "background-color": backgroundColor + "!important", - "color": fontColor + "!important" + "#wrapper.bi-background, #wrapper .bi-background": { + "background-color": backgroundColor, + "color": fontColor }, - ".bi-card": { - "background-color": cardBackgroundColor + "!important" + "#wrapper .bi-card": { + "background-color": cardBackgroundColor }, - ".bi-tips": { - "color": grayFontColor + "!important" + "#wrapper .bi-tips": { + "color": grayFontColor }, "div::-webkit-scrollbar,.scrollbar-layout-main": { "background-color": scrollBackgroundColor + "!important" diff --git a/docs/resource.css b/docs/resource.css index ef4dd0ada..f3b24fcc8 100644 --- a/docs/resource.css +++ b/docs/resource.css @@ -3192,12 +3192,12 @@ textarea::-webkit-scrollbar-thumb { } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .recover-chart-font-hightlight.native .b-font:before, .recover-chart-font-hightlight.disabled .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .tables-tile-view-font .b-font:before { content: "\e685"; @@ -6318,57 +6318,6 @@ textarea::-webkit-scrollbar-thumb { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/push_up.png'); _background: none; } -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -html, -body, -div, -ul, -li, -img, -a, -span, -p, -* { - margin: 0; - padding: 0; -} -a { - outline: none; - text-decoration: none; -} -a:focus { - outline: 0; -} -input, -textarea { - margin: 0; - padding: 0; - outline: none; - border: 1px solid #d4dadd; -} -.bi-theme-dark input, -.bi-theme-dark textarea { - border: 1px solid #525466; -} -ul, -ol { - margin: 0; - padding: 0; -} -ul { - list-style: disc; -} -li { - list-style-type: none; -} -i { - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; -} /** * Farbtastic Color Picker 1.2 * © 2008 Steven Wittens diff --git a/docs/widget.css b/docs/widget.css index df905928d..93cd3ac5e 100644 --- a/docs/widget.css +++ b/docs/widget.css @@ -44,9 +44,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement-droppable { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); z-index: 100000; } /****添加计算宽度的--运算符直接需要space****/ @@ -118,9 +115,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-date-picker { - background: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -170,7 +164,6 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; - background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #eff1f4; @@ -179,9 +172,6 @@ .bi-file-manager-nav-button .file-manager-nav-button-triangle { z-index: 1; } -.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text { - background: #242640; -} .bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #191b2b; color: #999999; diff --git a/docs/widget.js b/docs/widget.js index bfce10a76..1a44714db 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -4526,7 +4526,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-date-picker", + baseCls: "bi-date-picker bi-background", height: 25, min: '1900-01-01', //最小日期 max: '2099-12-31' //最大日期 @@ -7121,70 +7121,6 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); BI.FineTuningNumberEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.shortcut("bi.fine_tuning_number_editor", BI.FineTuningNumberEditor);/** - * Created by GameJian on 2016/1/28. - */ -BI.ImageButtonHref = BI.inherit(BI.Single, { - - _defaultConfig: function () { - return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-image-button-href", - title: BI.i18nText("BI-Add_Href") - }) - }, - - _init: function () { - BI.ImageButtonHref.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.trigger = BI.createWidget({ - type: "bi.icon_button", - cls: "img-href-font", - title: o.title, - height: 24, - width: 24 - }); - - this.input = BI.createWidget({ - type: "bi.clear_editor", - watermark: BI.i18nText("BI-Input_Href"), - width: 255, - height: 30 - }); - this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { - self.combo.hideView(); - }); - - this.combo = BI.createWidget({ - type: "bi.combo", - element: this, - direction: "bottom,left", - adjustYOffset: 3, - el: this.trigger, - popup: { - el: this.input, - stopPropagation: false, - minWidth: 255 - } - }); - - this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { - self.input.focus() - }); - - this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { - self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) - }) - }, - - getValue: function () { - return this.input.getValue(); - }, - - setValue: function (url) { - this.input.setValue(url) - } -}); -BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; -BI.shortcut("bi.image_button_href", BI.ImageButtonHref);/** * 交互行为布局 * * diff --git a/src/core/controller/controller.masker.js b/src/core/controller/controller.masker.js index 9d1bdcbd8..5c34fc8d5 100644 --- a/src/core/controller/controller.masker.js +++ b/src/core/controller/controller.masker.js @@ -6,9 +6,7 @@ */ BI.MaskersController = BI.inherit(BI.LayerController, { _defaultConfig: function () { - return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), { - render: "body" - }); + return BI.extend(BI.MaskersController.superclass._defaultConfig.apply(this, arguments), {}); }, _init: function () { diff --git a/src/css/resource/normal.css b/src/css/core/normal.css similarity index 100% rename from src/css/resource/normal.css rename to src/css/core/normal.css diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 9798047f7..e6cf5e6ad 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -125,6 +125,11 @@ background-color: transparent !important; color: #cccccc !important; } +.bi-list-item.disabled .bi-high-light, +.bi-list-item.disabled:hover .bi-high-light, +.bi-list-item.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item:hover, .bi-theme-dark .bi-list-item.hover { background-color: #191b2b; @@ -136,6 +141,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item.disabled .bi-high-light, +.bi-theme-dark .bi-list-item.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-simple:hover, .bi-list-item-simple.hover { color: #1a1a1a; @@ -145,6 +155,11 @@ .bi-list-item-simple.disabled:active { color: #cccccc !important; } +.bi-list-item-simple.disabled .bi-high-light, +.bi-list-item-simple.disabled:hover .bi-high-light, +.bi-list-item-simple.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-simple:hover, .bi-theme-dark .bi-list-item-simple.hover { color: #ffffff; @@ -154,6 +169,11 @@ .bi-theme-dark .bi-list-item-simple.disabled:active { color: #666666 !important; } +.bi-theme-dark .bi-list-item-simple.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-simple.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-simple.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-effect:hover { color: #1a1a1a; } @@ -166,6 +186,11 @@ .bi-list-item-effect.disabled:active { color: #cccccc !important; } +.bi-list-item-effect.disabled .bi-high-light, +.bi-list-item-effect.disabled:hover .bi-high-light, +.bi-list-item-effect.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-effect:hover { color: #ffffff; } @@ -179,6 +204,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-effect.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-effect.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-effect.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-hover:hover, .bi-list-item-hover.hover { color: #3f8ce8; @@ -190,6 +220,11 @@ color: #cccccc !important; background-color: transparent !important; } +.bi-list-item-hover.disabled .bi-high-light, +.bi-list-item-hover.disabled:hover .bi-high-light, +.bi-list-item-hover.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-hover:hover, .bi-theme-dark .bi-list-item-hover.hover { color: #3f8ce8; @@ -201,6 +236,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-hover.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-hover.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-hover.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-active:hover, .bi-list-item-active.hover { color: #1a1a1a; @@ -217,6 +257,11 @@ background-color: transparent !important; color: #cccccc !important; } +.bi-list-item-active.disabled .bi-high-light, +.bi-list-item-active.disabled:hover .bi-high-light, +.bi-list-item-active.disabled:active .bi-high-light { + color: #cccccc !important; +} .bi-theme-dark .bi-list-item-active:hover, .bi-theme-dark .bi-list-item-active.hover { background-color: #191b2b; @@ -233,6 +278,11 @@ background-color: transparent !important; color: #666666 !important; } +.bi-theme-dark .bi-list-item-active.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-active.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light { + color: #666666 !important; +} .bi-list-item-select:hover, .bi-list-item-select.hover { color: #3f8ce8; diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 268aada16..b7944bb8d 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -2578,12 +2578,12 @@ } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .recover-chart-font-hightlight.native .b-font:before, .recover-chart-font-hightlight.disabled .b-font:before { content: "\e6b4"; - color: #3f8ce8; + color: inherit; } .tables-tile-view-font .b-font:before { content: "\e685"; diff --git a/src/css/widget/arrangement/arrangement.droppable.css b/src/css/widget/arrangement/arrangement.droppable.css index 2ae94e0f7..bc396ebf5 100644 --- a/src/css/widget/arrangement/arrangement.droppable.css +++ b/src/css/widget/arrangement/arrangement.droppable.css @@ -2,8 +2,5 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement-droppable { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); z-index: 100000; } diff --git a/src/css/widget/date/calendar/picker.date.css b/src/css/widget/date/calendar/picker.date.css index 6a76b7b14..2f6491e13 100644 --- a/src/css/widget/date/calendar/picker.date.css +++ b/src/css/widget/date/calendar/picker.date.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-date-picker { - background: #f4f4f4; -} diff --git a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css index 364095f9d..ac90ed309 100644 --- a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css +++ b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css @@ -3,7 +3,6 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; - background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #eff1f4; @@ -12,9 +11,6 @@ .bi-file-manager-nav-button .file-manager-nav-button-triangle { z-index: 1; } -.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text { - background: #242640; -} .bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #191b2b; color: #999999; diff --git a/src/less/resource/normal.less b/src/less/core/normal.less similarity index 100% rename from src/less/resource/normal.less rename to src/less/core/normal.less diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index e815d6a3c..fbfe3a2b8 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -173,6 +173,9 @@ &, &:hover, &:active { background-color: transparent !important; color: @color-bi-text-disabled !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } } } } @@ -187,6 +190,9 @@ &, &:hover, &:active { background-color: transparent !important; color: @color-bi-text-disabled-theme-dark !important; + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } } } } @@ -200,6 +206,9 @@ &.disabled { &, &:hover, &:active { color: @color-bi-text-disabled !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } } } } @@ -212,6 +221,9 @@ &.disabled { &, &:hover, &:active { color: @color-bi-text-disabled-theme-dark !important; + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } } } } @@ -228,6 +240,9 @@ &.disabled { &, &:hover, &:active { color: @color-bi-text-disabled !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } } } } @@ -244,6 +259,9 @@ &, &:hover, &:active { background-color: transparent !important; color: @color-bi-text-disabled-theme-dark !important; + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } } } } @@ -259,6 +277,9 @@ &, &:hover, &:active { color: @color-bi-text-disabled !important; background-color: transparent !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } } } } @@ -273,6 +294,9 @@ &, &:hover, &:active { background-color: transparent !important; color: @color-bi-text-disabled-theme-dark !important; + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } } } } @@ -292,6 +316,9 @@ &, &:hover, &:active { background-color: transparent !important; color: @color-bi-text-disabled !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } } } } @@ -310,6 +337,9 @@ &, &:hover, &:active { background-color: transparent !important; color: @color-bi-text-disabled-theme-dark !important; + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } } } } diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 76d813b0a..7f4580ef3 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -244,7 +244,7 @@ .font-hover-active(sql-table-font, @font-sql-table, @color-bi-text-highlight, @color-bi-text-highlight, @color-bi-text); .font(refresh-table-font, @font-refresh); -.font(recover-chart-font-hightlight, @font-recover-chart, @color-bi-text-highlight); +.font(recover-chart-font-hightlight, @font-recover-chart); .font-hover-active(tables-tile-view-font, @font-tile-view, inherit, inherit, @color-bi-text); .font-hover-active(tables-relation-view-font, @font-relation-view, inherit, inherit, @color-bi-text); diff --git a/src/less/widget/arrangement/arrangement.droppable.less b/src/less/widget/arrangement/arrangement.droppable.less index a286327a0..d11f2512a 100644 --- a/src/less/widget/arrangement/arrangement.droppable.less +++ b/src/less/widget/arrangement/arrangement.droppable.less @@ -1,7 +1,5 @@ @import "../../bibase"; .bi-arrangement-droppable{ - background:@color-bi-background-virtual-blue; - .opacity(0.8); z-index: @zIndex-layer; } \ No newline at end of file diff --git a/src/less/widget/date/calendar/picker.date.less b/src/less/widget/date/calendar/picker.date.less index bcdf79a2d..926a62134 100644 --- a/src/less/widget/date/calendar/picker.date.less +++ b/src/less/widget/date/calendar/picker.date.less @@ -1,5 +1,4 @@ @import "../../../bibase"; -.bi-date-picker{ - background: @color-bi-background-gray; +.bi-date-picker { } \ No newline at end of file diff --git a/src/less/widget/filemanager/nav/button/button.nav.filemanager.less b/src/less/widget/filemanager/nav/button/button.nav.filemanager.less index 64361afd7..cd78da890 100644 --- a/src/less/widget/filemanager/nav/button/button.nav.filemanager.less +++ b/src/less/widget/filemanager/nav/button/button.nav.filemanager.less @@ -3,7 +3,6 @@ .bi-file-manager-nav-button { & .file-manager-nav-button-text { max-width: 200px; - background: @color-bi-background-default; &.active { background-color: @color-bi-background-normal; color: @color-bi-text-gray; @@ -17,12 +16,10 @@ .bi-theme-dark { .bi-file-manager-nav-button { & .file-manager-nav-button-text { - background: @color-bi-background-default-theme-dark; &.active { background-color: @color-bi-background-normal-theme-dark; color: @color-bi-text-gray; } } } - } \ No newline at end of file diff --git a/src/less/widget/image/button/href/image.button.href.less b/src/less/widget/image/button/href/image.button.href.less deleted file mode 100644 index c21685e57..000000000 --- a/src/less/widget/image/button/href/image.button.href.less +++ /dev/null @@ -1,7 +0,0 @@ -@import "../../../../bibase"; -.bi-image-button-href { - & .image-button-href-icon-button{ - z-index: 1; - font-size: @font-size-16 - } -} \ No newline at end of file diff --git a/src/less/widget/image/button/size/image.button.size.less b/src/less/widget/image/button/size/image.button.size.less deleted file mode 100644 index b81543839..000000000 --- a/src/less/widget/image/button/size/image.button.size.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "../../../../bibase"; -.bi-image-button-size{ - & .image-button-size-button-group{ - font-size: @font-size-12; - } -} \ No newline at end of file diff --git a/src/less/widget/image/uploadimage.less b/src/less/widget/image/uploadimage.less deleted file mode 100644 index e94358612..000000000 --- a/src/less/widget/image/uploadimage.less +++ /dev/null @@ -1,16 +0,0 @@ -@import "../../bibase"; -.bi-upload-image{ - & .upload-image-text-button-label{ - font-size: @font-size-14; - color: @font-color-tips - } - - & .upload-image-icon-button{ - z-index: 1; - font-size: @font-size-16; - } - - & .upload-image-delete-label{ - font-size: @font-size-14; - } -} \ No newline at end of file diff --git a/src/widget/date/calendar/picker.date.js b/src/widget/date/calendar/picker.date.js index cf395224d..ffec7bebf 100644 --- a/src/widget/date/calendar/picker.date.js +++ b/src/widget/date/calendar/picker.date.js @@ -7,7 +7,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-date-picker", + baseCls: "bi-date-picker bi-background", height: 25, min: '1900-01-01', //最小日期 max: '2099-12-31' //最大日期 diff --git a/src/widget/image/button/href/image.button.href.js b/src/widget/image/button/href/image.button.href.js deleted file mode 100644 index 41d44369d..000000000 --- a/src/widget/image/button/href/image.button.href.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Created by GameJian on 2016/1/28. - */ -BI.ImageButtonHref = BI.inherit(BI.Single, { - - _defaultConfig: function () { - return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-image-button-href", - title: BI.i18nText("BI-Add_Href") - }) - }, - - _init: function () { - BI.ImageButtonHref.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.trigger = BI.createWidget({ - type: "bi.icon_button", - cls: "img-href-font", - title: o.title, - height: 24, - width: 24 - }); - - this.input = BI.createWidget({ - type: "bi.clear_editor", - watermark: BI.i18nText("BI-Input_Href"), - width: 255, - height: 30 - }); - this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { - self.combo.hideView(); - }); - - this.combo = BI.createWidget({ - type: "bi.combo", - element: this, - direction: "bottom,left", - adjustYOffset: 3, - el: this.trigger, - popup: { - el: this.input, - stopPropagation: false, - minWidth: 255 - } - }); - - this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { - self.input.focus() - }); - - this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { - self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) - }) - }, - - getValue: function () { - return this.input.getValue(); - }, - - setValue: function (url) { - this.input.setValue(url) - } -}); -BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; -BI.shortcut("bi.image_button_href", BI.ImageButtonHref); \ No newline at end of file