From 0877c9c4c08d70d8ba39bfdce8a6373f55266d6e Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Sun, 6 May 2018 21:45:35 +0800 Subject: [PATCH] update --- demo/js/base/editor/demo.editor.js | 2 +- dist/base.css | 4 ++-- dist/base.js | 1 + dist/bundle.css | 16 +++++++++++----- dist/bundle.js | 3 +++ dist/case.js | 2 ++ dist/core.css | 10 ++++++++-- dist/core_without_normalize.css | 10 ++++++++-- dist/demo.js | 2 +- dist/fineui.css | 16 +++++++++++----- dist/fineui.js | 3 +++ dist/widget.css | 2 +- src/base/single/editor/editor.js | 1 + src/case/richeditor/richeditor.js | 2 ++ src/css/base/single/button/button.css | 4 ++-- src/css/core/utils/common.css | 10 ++++++++-- src/css/widget/filter/abstractitem/filter.css | 2 +- src/less/core/utils/common.less | 6 ++++++ src/less/lib/constant.less | 2 +- 19 files changed, 73 insertions(+), 25 deletions(-) diff --git a/demo/js/base/editor/demo.editor.js b/demo/js/base/editor/demo.editor.js index 0cfba21cfa..7dc5dda3d2 100644 --- a/demo/js/base/editor/demo.editor.js +++ b/demo/js/base/editor/demo.editor.js @@ -5,7 +5,7 @@ Demo.Editor = BI.inherit(BI.Widget, { render: function () { var editor1 = BI.createWidget({ type: "bi.editor", - cls: "mvc-border", + cls: "bi-border", watermark: "alert信息显示在下面", errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", width: 200, diff --git a/dist/base.css b/dist/base.css index a83bf319e9..3f4de1dcaa 100644 --- a/dist/base.css +++ b/dist/base.css @@ -1003,7 +1003,7 @@ body .bi-button, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #178cdf; + border: 1px solid #3685f2; background-color: #3f8ce8; text-align: center; vertical-align: middle; @@ -1069,7 +1069,7 @@ body .bi-button.button-common.ghost:active, body .bi-button.button-ignore, #body .bi-button.button-ignore { background-color: #ffffff; - border-color: #178cdf; + border-color: #3685f2; } body .bi-button.button-ignore, #body .bi-button.button-ignore, diff --git a/dist/base.js b/dist/base.js index d0ae050874..5977dd0887 100644 --- a/dist/base.js +++ b/dist/base.js @@ -18398,6 +18398,7 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); + this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); diff --git a/dist/bundle.css b/dist/bundle.css index 59d03c8a39..523b61cbdc 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -394,6 +394,12 @@ textarea { .bi-border { border: 1px solid #d4dadd; } +.bi-border.bi-editor-focus { + border: 1px solid #3685f2; +} +.bi-border.niceditor-focus { + border: 1px solid #3685f2; +} .bi-theme-dark .bi-border { border: 1px solid #525466; } @@ -450,7 +456,7 @@ textarea { color: #ffffff; } .bi-high-light-border { - border-color: #178cdf; + border-color: #3685f2; } .bi-water-mark { color: #cccccc; @@ -578,7 +584,7 @@ textarea { } .bi-list-item-border:active, .bi-list-item-border.active { - border: 1px solid #178cdf; + border: 1px solid #3685f2; } .bi-list-item-simple:hover, .bi-list-item-simple.hover { @@ -3049,7 +3055,7 @@ body .bi-button, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #178cdf; + border: 1px solid #3685f2; background-color: #3f8ce8; text-align: center; vertical-align: middle; @@ -3115,7 +3121,7 @@ body .bi-button.button-common.ghost:active, body .bi-button.button-ignore, #body .bi-button.button-ignore { background-color: #ffffff; - border-color: #178cdf; + border-color: #3685f2; } body .bi-button.button-ignore, #body .bi-button.button-ignore, @@ -4597,7 +4603,7 @@ ul.ztree.zTreeDragUL { color: #999999; } .bi-filter-item .filter-item-empty-item .empty-filter-item-leaf { - border: 1px dashed #178cdf; + border: 1px dashed #3685f2; background: #eaf2fd; } .bi-filter-expander { diff --git a/dist/bundle.js b/dist/bundle.js index 346fba2b9e..aec013997d 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54164,6 +54164,7 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); + this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); @@ -83997,11 +83998,13 @@ BI.RichEditor = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.NicEditor.EVENT_BLUR, action: function () { + self.element.removeClass("bi-editor-focus"); self.fireEvent(BI.RichEditor.EVENT_CONFIRM); } }, { eventName: BI.NicEditor.EVENT_FOCUS, action: function () { + self.element.addClass("bi-editor-focus"); if (!o.readOnly && !self.combo.isViewVisible()) { self.combo.showView(); } diff --git a/dist/case.js b/dist/case.js index bb023d253f..b1820e7544 100644 --- a/dist/case.js +++ b/dist/case.js @@ -11542,11 +11542,13 @@ BI.RichEditor = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.NicEditor.EVENT_BLUR, action: function () { + self.element.removeClass("bi-editor-focus"); self.fireEvent(BI.RichEditor.EVENT_CONFIRM); } }, { eventName: BI.NicEditor.EVENT_FOCUS, action: function () { + self.element.addClass("bi-editor-focus"); if (!o.readOnly && !self.combo.isViewVisible()) { self.combo.showView(); } diff --git a/dist/core.css b/dist/core.css index d4f0e77895..59a8617e9e 100644 --- a/dist/core.css +++ b/dist/core.css @@ -394,6 +394,12 @@ textarea { .bi-border { border: 1px solid #d4dadd; } +.bi-border.bi-editor-focus { + border: 1px solid #3685f2; +} +.bi-border.niceditor-focus { + border: 1px solid #3685f2; +} .bi-theme-dark .bi-border { border: 1px solid #525466; } @@ -450,7 +456,7 @@ textarea { color: #ffffff; } .bi-high-light-border { - border-color: #178cdf; + border-color: #3685f2; } .bi-water-mark { color: #cccccc; @@ -578,7 +584,7 @@ textarea { } .bi-list-item-border:active, .bi-list-item-border.active { - border: 1px solid #178cdf; + border: 1px solid #3685f2; } .bi-list-item-simple:hover, .bi-list-item-simple.hover { diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index efb3275e52..7ebe190f6e 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -116,6 +116,12 @@ textarea { .bi-border { border: 1px solid #d4dadd; } +.bi-border.bi-editor-focus { + border: 1px solid #3685f2; +} +.bi-border.niceditor-focus { + border: 1px solid #3685f2; +} .bi-theme-dark .bi-border { border: 1px solid #525466; } @@ -172,7 +178,7 @@ textarea { color: #ffffff; } .bi-high-light-border { - border-color: #178cdf; + border-color: #3685f2; } .bi-water-mark { color: #cccccc; @@ -300,7 +306,7 @@ textarea { } .bi-list-item-border:active, .bi-list-item-border.active { - border: 1px solid #178cdf; + border: 1px solid #3685f2; } .bi-list-item-simple:hover, .bi-list-item-simple.hover { diff --git a/dist/demo.js b/dist/demo.js index a051fbe368..ea87e32363 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -717,7 +717,7 @@ BI.shortcut("demo.code_editor", Demo.CodeEditor);Demo.Editor = BI.inherit(BI.Wid render: function () { var editor1 = BI.createWidget({ type: "bi.editor", - cls: "mvc-border", + cls: "bi-border", watermark: "alert信息显示在下面", errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", width: 200, diff --git a/dist/fineui.css b/dist/fineui.css index bac1cb80ce..e9841d2db4 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -394,6 +394,12 @@ textarea { .bi-border { border: 1px solid #d4dadd; } +.bi-border.bi-editor-focus { + border: 1px solid #3685f2; +} +.bi-border.niceditor-focus { + border: 1px solid #3685f2; +} .bi-theme-dark .bi-border { border: 1px solid #525466; } @@ -450,7 +456,7 @@ textarea { color: #ffffff; } .bi-high-light-border { - border-color: #178cdf; + border-color: #3685f2; } .bi-water-mark { color: #cccccc; @@ -578,7 +584,7 @@ textarea { } .bi-list-item-border:active, .bi-list-item-border.active { - border: 1px solid #178cdf; + border: 1px solid #3685f2; } .bi-list-item-simple:hover, .bi-list-item-simple.hover { @@ -3049,7 +3055,7 @@ body .bi-button, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #178cdf; + border: 1px solid #3685f2; background-color: #3f8ce8; text-align: center; vertical-align: middle; @@ -3115,7 +3121,7 @@ body .bi-button.button-common.ghost:active, body .bi-button.button-ignore, #body .bi-button.button-ignore { background-color: #ffffff; - border-color: #178cdf; + border-color: #3685f2; } body .bi-button.button-ignore, #body .bi-button.button-ignore, @@ -4597,7 +4603,7 @@ ul.ztree.zTreeDragUL { color: #999999; } .bi-filter-item .filter-item-empty-item .empty-filter-item-leaf { - border: 1px dashed #178cdf; + border: 1px dashed #3685f2; background: #eaf2fd; } .bi-filter-expander { diff --git a/dist/fineui.js b/dist/fineui.js index 50dd59c6af..e28d3a4054 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54407,6 +54407,7 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); + this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); @@ -84240,11 +84241,13 @@ BI.RichEditor = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.NicEditor.EVENT_BLUR, action: function () { + self.element.removeClass("bi-editor-focus"); self.fireEvent(BI.RichEditor.EVENT_CONFIRM); } }, { eventName: BI.NicEditor.EVENT_FOCUS, action: function () { + self.element.addClass("bi-editor-focus"); if (!o.readOnly && !self.combo.isViewVisible()) { self.combo.showView(); } diff --git a/dist/widget.css b/dist/widget.css index 1edeec49b9..f5f46961a6 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -108,7 +108,7 @@ color: #999999; } .bi-filter-item .filter-item-empty-item .empty-filter-item-leaf { - border: 1px dashed #178cdf; + border: 1px dashed #3685f2; background: #eaf2fd; } .bi-filter-expander { diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index a2ac09fd11..5e102aa0e6 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -98,6 +98,7 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); + this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); diff --git a/src/case/richeditor/richeditor.js b/src/case/richeditor/richeditor.js index 54cfe33b0d..fa9859a193 100644 --- a/src/case/richeditor/richeditor.js +++ b/src/case/richeditor/richeditor.js @@ -26,11 +26,13 @@ BI.RichEditor = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.NicEditor.EVENT_BLUR, action: function () { + self.element.removeClass("bi-editor-focus"); self.fireEvent(BI.RichEditor.EVENT_CONFIRM); } }, { eventName: BI.NicEditor.EVENT_FOCUS, action: function () { + self.element.addClass("bi-editor-focus"); if (!o.readOnly && !self.combo.isViewVisible()) { self.combo.showView(); } diff --git a/src/css/base/single/button/button.css b/src/css/base/single/button/button.css index d1acdd33e7..f7a5d97698 100644 --- a/src/css/base/single/button/button.css +++ b/src/css/base/single/button/button.css @@ -3,7 +3,7 @@ body .bi-button, -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #178cdf; + border: 1px solid #3685f2; background-color: #3f8ce8; text-align: center; vertical-align: middle; @@ -69,7 +69,7 @@ body .bi-button.button-common.ghost:active, body .bi-button.button-ignore, #body .bi-button.button-ignore { background-color: #ffffff; - border-color: #178cdf; + border-color: #3685f2; } body .bi-button.button-ignore, #body .bi-button.button-ignore, diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 368d31dbdd..fcad59e0e6 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -116,6 +116,12 @@ textarea { .bi-border { border: 1px solid #d4dadd; } +.bi-border.bi-editor-focus { + border: 1px solid #3685f2; +} +.bi-border.niceditor-focus { + border: 1px solid #3685f2; +} .bi-theme-dark .bi-border { border: 1px solid #525466; } @@ -172,7 +178,7 @@ textarea { color: #ffffff; } .bi-high-light-border { - border-color: #178cdf; + border-color: #3685f2; } .bi-water-mark { color: #cccccc; @@ -300,7 +306,7 @@ textarea { } .bi-list-item-border:active, .bi-list-item-border.active { - border: 1px solid #178cdf; + border: 1px solid #3685f2; } .bi-list-item-simple:hover, .bi-list-item-simple.hover { diff --git a/src/css/widget/filter/abstractitem/filter.css b/src/css/widget/filter/abstractitem/filter.css index b270b60a49..e2e62ac608 100644 --- a/src/css/widget/filter/abstractitem/filter.css +++ b/src/css/widget/filter/abstractitem/filter.css @@ -1,4 +1,4 @@ .bi-filter-item .filter-item-empty-item .empty-filter-item-leaf { - border: 1px dashed #178cdf; + border: 1px dashed #3685f2; background: #eaf2fd; } diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 4a2d6b2e48..c2581febb0 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -135,6 +135,12 @@ textarea { //边框 .bi-border { border: 1px solid @color-bi-border-line; + &.bi-editor-focus { + border: 1px solid @color-bi-border-highlight; + } + &.niceditor-focus { + border: 1px solid @color-bi-border-highlight; + } } .bi-theme-dark { diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 2e1a5cdbfe..7bae469ea8 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -56,7 +56,7 @@ @border-color-black: #1a1a1a; @border-color-line: #d4dadd; @border-color-line-theme-dark: #525466; -@border-color-highlight: #178cdf; +@border-color-highlight: #3685f2; @border-color-warning: #fbb03b; @border-color-negative: #e85050;