BI-19821

dist/bundle.css

@@ -394,11 +394,18 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
-.bi-border.bi-editor-focus {
+.bi-border.bi-nic-editor:hover,
+.bi-border.bi-rich-editor:hover,
+.bi-border.bi-nic-editor.hover,
+.bi-border.bi-rich-editor.hover {
   border: 1px solid #3685f2;
 }
-.bi-border.niceditor-focus {
+.bi-border.bi-rich-editor-focus,
+.bi-border.bi-nic-editor-focus {
   border: 1px solid #3685f2;
+  -webkit-box-shadow: 0 0 0 2px #3685f2;
+  -moz-box-shadow: 0 0 0 2px #3685f2;
+  box-shadow: 0 0 0 2px #3685f2;
 }
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;

dist/bundle.js

@@ -79195,6 +79195,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
                 self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
             }
         });
+        this.check();
 
         BI.createWidget({
             type: "bi.vertical",
@@ -83317,6 +83318,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 }
                 this.ne.fireEvent("selected", e);
                 this.isFocused = true;
+                this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
                 this.elm.element.addClass(prefix + "selected");
             }
             // return false;
@@ -83328,6 +83330,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         blur: function () {
             this.isFocused = false;
+            this.ne.element.removeClass("bi-nic-editor-focus");
             this.elm.element.removeClass(prefix + "selected");
         },
 
@@ -83998,13 +84001,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             listeners: [{
                 eventName: BI.NicEditor.EVENT_BLUR,
                 action: function () {
-                    self.element.removeClass("bi-editor-focus");
+                    self.element.removeClass("bi-rich-editor-focus");
                     self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
                 }
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
-                    self.element.addClass("bi-editor-focus");
+                    self.element.addClass("bi-rich-editor-focus");
                     if (!o.readOnly && !self.combo.isViewVisible()) {
                         self.combo.showView();
                     }

dist/case.js

@@ -6739,6 +6739,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
                 self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
             }
         });
+        this.check();
 
         BI.createWidget({
             type: "bi.vertical",
@@ -10861,6 +10862,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 }
                 this.ne.fireEvent("selected", e);
                 this.isFocused = true;
+                this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
                 this.elm.element.addClass(prefix + "selected");
             }
             // return false;
@@ -10872,6 +10874,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         blur: function () {
             this.isFocused = false;
+            this.ne.element.removeClass("bi-nic-editor-focus");
             this.elm.element.removeClass(prefix + "selected");
         },
 
@@ -11542,13 +11545,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             listeners: [{
                 eventName: BI.NicEditor.EVENT_BLUR,
                 action: function () {
-                    self.element.removeClass("bi-editor-focus");
+                    self.element.removeClass("bi-rich-editor-focus");
                     self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
                 }
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
-                    self.element.addClass("bi-editor-focus");
+                    self.element.addClass("bi-rich-editor-focus");
                     if (!o.readOnly && !self.combo.isViewVisible()) {
                         self.combo.showView();
                     }

dist/core.css

@@ -394,11 +394,18 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
-.bi-border.bi-editor-focus {
+.bi-border.bi-nic-editor:hover,
+.bi-border.bi-rich-editor:hover,
+.bi-border.bi-nic-editor.hover,
+.bi-border.bi-rich-editor.hover {
   border: 1px solid #3685f2;
 }
-.bi-border.niceditor-focus {
+.bi-border.bi-rich-editor-focus,
+.bi-border.bi-nic-editor-focus {
   border: 1px solid #3685f2;
+  -webkit-box-shadow: 0 0 0 2px #3685f2;
+  -moz-box-shadow: 0 0 0 2px #3685f2;
+  box-shadow: 0 0 0 2px #3685f2;
 }
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;

dist/core_without_normalize.css

@@ -116,11 +116,18 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
-.bi-border.bi-editor-focus {
+.bi-border.bi-nic-editor:hover,
+.bi-border.bi-rich-editor:hover,
+.bi-border.bi-nic-editor.hover,
+.bi-border.bi-rich-editor.hover {
   border: 1px solid #3685f2;
 }
-.bi-border.niceditor-focus {
+.bi-border.bi-rich-editor-focus,
+.bi-border.bi-nic-editor-focus {
   border: 1px solid #3685f2;
+  -webkit-box-shadow: 0 0 0 2px #3685f2;
+  -moz-box-shadow: 0 0 0 2px #3685f2;
+  box-shadow: 0 0 0 2px #3685f2;
 }
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;

dist/fineui.css

@@ -394,11 +394,18 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
-.bi-border.bi-editor-focus {
+.bi-border.bi-nic-editor:hover,
+.bi-border.bi-rich-editor:hover,
+.bi-border.bi-nic-editor.hover,
+.bi-border.bi-rich-editor.hover {
   border: 1px solid #3685f2;
 }
-.bi-border.niceditor-focus {
+.bi-border.bi-rich-editor-focus,
+.bi-border.bi-nic-editor-focus {
   border: 1px solid #3685f2;
+  -webkit-box-shadow: 0 0 0 2px #3685f2;
+  -moz-box-shadow: 0 0 0 2px #3685f2;
+  box-shadow: 0 0 0 2px #3685f2;
 }
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;

dist/fineui.js

@@ -79438,6 +79438,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
                 self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
             }
         });
+        this.check();
 
         BI.createWidget({
             type: "bi.vertical",
@@ -83560,6 +83561,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 }
                 this.ne.fireEvent("selected", e);
                 this.isFocused = true;
+                this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
                 this.elm.element.addClass(prefix + "selected");
             }
             // return false;
@@ -83571,6 +83573,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         blur: function () {
             this.isFocused = false;
+            this.ne.element.removeClass("bi-nic-editor-focus");
             this.elm.element.removeClass(prefix + "selected");
         },
 
@@ -84241,13 +84244,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             listeners: [{
                 eventName: BI.NicEditor.EVENT_BLUR,
                 action: function () {
-                    self.element.removeClass("bi-editor-focus");
+                    self.element.removeClass("bi-rich-editor-focus");
                     self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
                 }
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
-                    self.element.addClass("bi-editor-focus");
+                    self.element.addClass("bi-rich-editor-focus");
                     if (!o.readOnly && !self.combo.isViewVisible()) {
                         self.combo.showView();
                     }

src/case/combo/textvaluecombo/popup.textvalue.js

@@ -29,6 +29,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
                 self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
             }
         });
+        this.check();
 
         BI.createWidget({
             type: "bi.vertical",

src/case/richeditor/niceditor/niceditor.js

@@ -247,6 +247,7 @@
                 }
                 this.ne.fireEvent("selected", e);
                 this.isFocused = true;
+                this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
                 this.elm.element.addClass(prefix + "selected");
             }
             // return false;
@@ -258,6 +259,7 @@
 
         blur: function () {
             this.isFocused = false;
+            this.ne.element.removeClass("bi-nic-editor-focus");
             this.elm.element.removeClass(prefix + "selected");
         },
 

src/case/richeditor/richeditor.js

@@ -26,13 +26,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             listeners: [{
                 eventName: BI.NicEditor.EVENT_BLUR,
                 action: function () {
-                    self.element.removeClass("bi-editor-focus");
+                    self.element.removeClass("bi-rich-editor-focus");
                     self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
                 }
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
-                    self.element.addClass("bi-editor-focus");
+                    self.element.addClass("bi-rich-editor-focus");
                     if (!o.readOnly && !self.combo.isViewVisible()) {
                         self.combo.showView();
                     }

src/css/core/utils/common.css

@@ -116,11 +116,18 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
-.bi-border.bi-editor-focus {
+.bi-border.bi-nic-editor:hover,
+.bi-border.bi-rich-editor:hover,
+.bi-border.bi-nic-editor.hover,
+.bi-border.bi-rich-editor.hover {
   border: 1px solid #3685f2;
 }
-.bi-border.niceditor-focus {
+.bi-border.bi-rich-editor-focus,
+.bi-border.bi-nic-editor-focus {
   border: 1px solid #3685f2;
+  -webkit-box-shadow: 0 0 0 2px #3685f2;
+  -moz-box-shadow: 0 0 0 2px #3685f2;
+  box-shadow: 0 0 0 2px #3685f2;
 }
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;

src/less/core/utils/common.less

@@ -135,11 +135,14 @@ textarea {
 //边框
 .bi-border {
   border: 1px solid @color-bi-border-line;
-  &.bi-editor-focus {
+  &.bi-nic-editor, &.bi-rich-editor {
-    border: 1px solid @color-bi-border-highlight;
+    &:hover, &.hover{
+      border: 1px solid @color-bi-border-highlight;
+    }
   }
-  &.niceditor-focus {
+  &.bi-rich-editor-focus, &.bi-nic-editor-focus {
     border: 1px solid @color-bi-border-highlight;
+    .box-shadow(0 0 0 2px, @color-bi-border-highlight);
   }
 }