From 4c0da2626e18a9275a91a4963c47f2eac1170893 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 17 Aug 2018 14:11:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo/demo.search_text_value_combo.js | 1 - dist/base.css | 6 ++- dist/bundle.css | 42 ++++++++++--------- dist/bundle.js | 2 +- dist/case.js | 2 +- dist/demo.js | 1 - dist/fineui.css | 42 ++++++++++--------- dist/fineui.js | 2 +- dist/resource.css | 36 ++++++++-------- public/css/font.css | 36 ++++++++-------- .../combo.searchtextvalue.js | 2 +- src/css/resource/font.css | 36 ++++++++-------- ui/css/font.css | 36 ++++++++-------- 13 files changed, 124 insertions(+), 120 deletions(-) diff --git a/demo/js/case/combo/demo.search_text_value_combo.js b/demo/js/case/combo/demo.search_text_value_combo.js index a5da437b3..7491283d6 100644 --- a/demo/js/case/combo/demo.search_text_value_combo.js +++ b/demo/js/case/combo/demo.search_text_value_combo.js @@ -11,7 +11,6 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.search_text_value_combo", - disabled: true, ref: function () { combo = this; }, diff --git a/dist/base.css b/dist/base.css index 9a5ae1a2d..691fcd29b 100644 --- a/dist/base.css +++ b/dist/base.css @@ -1162,10 +1162,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, border-radius: 2px; } .bi-bubble .bubble-error { - background-color: rgba(255, 73, 73, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949); + background: #ffecec; color: #ff4949; } +.bi-theme-dark .bi-bubble .bubble-error { + background: #3A2940; +} .bi-bubble .bubble-common { background: #eaf2fd; color: #3685f2; diff --git a/dist/bundle.css b/dist/bundle.css index 3c623823a..51e08d8d0 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -3116,10 +3116,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, border-radius: 2px; } .bi-bubble .bubble-error { - background-color: rgba(255, 73, 73, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949); + background: #ffecec; color: #ff4949; } +.bi-theme-dark .bi-bubble .bubble-error { + background: #3A2940; +} .bi-bubble .bubble-common { background: #eaf2fd; color: #3685f2; @@ -4937,69 +4939,69 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-bold-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-bold-font.disabled .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-italic-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-italic-font.disabled .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-color-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-color-font.disabled .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-background-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-background-font.disabled .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-color-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-color-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-align-left-font .b-font { diff --git a/dist/bundle.js b/dist/bundle.js index d154f198e..4067ce530 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -53364,7 +53364,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { items: o.items, ref: function () { self.popup = this; - // self.trigger.getSearcher().setAdapter(self.popup); + self.trigger.getSearcher().setAdapter(self.popup); }, listeners: [{ eventName: BI.TextValueComboPopup.EVENT_CHANGE, diff --git a/dist/case.js b/dist/case.js index 306800a84..e68b07181 100644 --- a/dist/case.js +++ b/dist/case.js @@ -4730,7 +4730,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { items: o.items, ref: function () { self.popup = this; - // self.trigger.getSearcher().setAdapter(self.popup); + self.trigger.getSearcher().setAdapter(self.popup); }, listeners: [{ eventName: BI.TextValueComboPopup.EVENT_CHANGE, diff --git a/dist/demo.js b/dist/demo.js index 458446c07..3d9fc346a 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -1318,7 +1318,6 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.search_text_value_combo", - disabled: true, ref: function () { combo = this; }, diff --git a/dist/fineui.css b/dist/fineui.css index 2c969b25b..584fd8668 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -3116,10 +3116,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, border-radius: 2px; } .bi-bubble .bubble-error { - background-color: rgba(255, 73, 73, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949); + background: #ffecec; color: #ff4949; } +.bi-theme-dark .bi-bubble .bubble-error { + background: #3A2940; +} .bi-bubble .bubble-common { background: #eaf2fd; color: #3685f2; @@ -4937,69 +4939,69 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-bold-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-bold-font.disabled .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-italic-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-italic-font.disabled .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-color-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-color-font.disabled .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-background-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-background-font.disabled .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-color-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-color-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-align-left-font .b-font { diff --git a/dist/fineui.js b/dist/fineui.js index 5958feb1c..eb73b0257 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -53585,7 +53585,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { items: o.items, ref: function () { self.popup = this; - // self.trigger.getSearcher().setAdapter(self.popup); + self.trigger.getSearcher().setAdapter(self.popup); }, listeners: [{ eventName: BI.TextValueComboPopup.EVENT_CHANGE, diff --git a/dist/resource.css b/dist/resource.css index 943fdc2b7..42d9122b1 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -1130,69 +1130,69 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-bold-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-bold-font.disabled .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-italic-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-italic-font.disabled .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-color-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-color-font.disabled .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-background-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-background-font.disabled .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-color-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-color-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-align-left-font .b-font { diff --git a/public/css/font.css b/public/css/font.css index 6d1895676..dd4bf86a4 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -715,69 +715,69 @@ color: inherit; } .text-bold-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-bold-font.disabled .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-italic-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-italic-font.disabled .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-color-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-color-font.disabled .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-background-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-background-font.disabled .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-color-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-color-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-align-left-font .b-font { diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index bf8e4635a..6f69997ba 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js @@ -58,7 +58,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { items: o.items, ref: function () { self.popup = this; - // self.trigger.getSearcher().setAdapter(self.popup); + self.trigger.getSearcher().setAdapter(self.popup); }, listeners: [{ eventName: BI.TextValueComboPopup.EVENT_CHANGE, diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 326ce26ff..2f41f9f9d 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -715,69 +715,69 @@ color: inherit; } .text-bold-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-bold-font.disabled .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-italic-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-italic-font.disabled .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-color-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-color-font.disabled .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-background-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-background-font.disabled .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-color-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-color-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-align-left-font .b-font { diff --git a/ui/css/font.css b/ui/css/font.css index 0c728e7c6..17a314471 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -715,69 +715,69 @@ color: inherit; } .text-bold-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-bold-font.disabled .b-font:before { - content: "\e75b"; + content: "\e697"; color: inherit; } .text-italic-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-italic-font.disabled .b-font:before { - content: "\e75c"; + content: "\e69d"; color: inherit; } .text-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69c"; color: inherit; } .text-color-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-color-font.disabled .b-font:before { - content: "\e75a"; + content: "\e698"; color: inherit; } .text-background-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-background-font.disabled .b-font:before { - content: "\e758"; + content: "\e699"; color: inherit; } .text-color-underline-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-color-underline-font.disabled .b-font:before { - content: "\e75d"; + content: "\e69a"; color: inherit; } .text-align-left-font .b-font {