update

dist/base.css

@@ -422,12 +422,6 @@
   display: block !important;
   visibility: visible !important;
 }
-.bi-combo.bi-combo-popup:focus,
-.bi-combo.bi-combo-popup:focus-within {
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -447,20 +441,42 @@
 .bi-search-text-value-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
-.bi-combo:hover > .bi-search-text-value-trigger {
+.bi-search-text-value-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-search-text-value-combo:focus .bi-combo.bi-combo-popup .search-text-value-trigger,
+.bi-search-text-value-combo:focus-within .bi-combo.bi-combo-popup .search-text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-static-combo.bi-combo-popup .static-text-trigger,
+.bi-static-combo:hover .static-text-trigger {
   border-color: #3685f2;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
+.bi-icon-text-value-combo.bi-combo-popup .icon-text-value-trigger,
+.bi-icon-text-value-combo:hover .icon-text-value-trigger {
+  border-color: #3685f2;
+}
 
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
-.bi-combo.bi-combo-popup > .bi-select-text-trigger,
-.bi-combo:hover > .bi-select-text-trigger {
+.bi-text-value-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-check-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-check-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup .text-value-down-list-trigger,
+.bi-text-value-down-list-combo:hover .text-value-down-list-trigger {
   border-color: #3685f2;
 }
 /*************BI.SearchEditor******************/

dist/bundle.css

@@ -313,12 +313,7 @@ textarea {
   color: #606479 !important;
 }
 .bi-focus-shadow:focus-within,
-.bi-focus-shadow:focus {
-  border-color: #3685f2;
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
+.bi-focus-shadow:focus,
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
@@ -2284,12 +2279,6 @@ textarea {
   display: block !important;
   visibility: visible !important;
 }
-.bi-combo.bi-combo-popup:focus,
-.bi-combo.bi-combo-popup:focus-within {
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -2309,20 +2298,42 @@ textarea {
 .bi-search-text-value-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
-.bi-combo:hover > .bi-search-text-value-trigger {
+.bi-search-text-value-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-search-text-value-combo:focus .bi-combo.bi-combo-popup .search-text-value-trigger,
+.bi-search-text-value-combo:focus-within .bi-combo.bi-combo-popup .search-text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-static-combo.bi-combo-popup .static-text-trigger,
+.bi-static-combo:hover .static-text-trigger {
   border-color: #3685f2;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
+.bi-icon-text-value-combo.bi-combo-popup .icon-text-value-trigger,
+.bi-icon-text-value-combo:hover .icon-text-value-trigger {
+  border-color: #3685f2;
+}
 
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
-.bi-combo.bi-combo-popup > .bi-select-text-trigger,
-.bi-combo:hover > .bi-select-text-trigger {
+.bi-text-value-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-check-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-check-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup .text-value-down-list-trigger,
+.bi-text-value-down-list-combo:hover .text-value-down-list-trigger {
   border-color: #3685f2;
 }
 /*************BI.SearchEditor******************/
@@ -4255,8 +4266,11 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
+.bi-multi-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
   border-color: #3685f2;
 }
 
@@ -4275,6 +4289,13 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-insert-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-insert-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {
@@ -4513,7 +4534,30 @@ ul.ztree.zTreeDragUL {
   display: none;
 }
 .bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
+.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger,
+.bi-combo.bi-combo-popup:focus-within > .bi-single-select-trigger {
+  border-color: #3685f2;
+}
+.bi-single-select-combo .single-select-trigger-icon-button {
+  font-size: 16px;
+}
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  display: block;
+}
+.bi-single-select-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-single-select-combo.combo-show .trigger-down {
+  display: none;
+}
+.bi-single-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-single-select-combo:focus .bi-combo.bi-combo-popup .bi-single-select-trigger,
+.bi-single-select-combo:focus-within .bi-combo.bi-combo-popup .bi-single-select-trigger {
   border-color: #3685f2;
 }
 .bi-single-slider-label {

dist/bundle.js

@@ -78679,6 +78679,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_icon_text_trigger",
+            cls: "icon-text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -78829,7 +78830,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        warningTitle: ""
+        warningTitle: "",
+        attributes: {
+            tabIndex: 0
+        }
     },
 
     render: function () {
@@ -78845,11 +78849,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     ref: function () {
                         self.combo = this;
                     },
-                    attributes: {
-                        tabIndex: 0
-                    },
                     el: {
                         type: "bi.search_text_value_trigger",
+                        cls: "search-text-value-trigger",
                         ref: function () {
                             self.trigger = this;
                         },
@@ -79047,7 +79049,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
+        baseCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 
@@ -79162,7 +79164,10 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
             text: "",
             el: {},
             items: [],
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -79171,7 +79176,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.text_trigger",
-            cls: "bi-border",
+            cls: "bi-border static-text-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79225,11 +79230,14 @@ BI.shortcut("bi.static_combo", BI.StaticCombo);/**
 BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-text-value-check-combo",
+            baseCls: "bi-text-value-check-combo",
             width: 100,
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -79238,6 +79246,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79450,6 +79459,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79651,7 +79661,10 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-text-value-down-list-combo",
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -79667,6 +79680,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         }
         this.trigger = BI.createWidget({
             type: "bi.down_list_select_text_trigger",
+            cls: "text-value-down-list-trigger",
             height: o.height,
             items: o.items,
             text: o.text,
@@ -83663,7 +83677,9 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 type: "bi.default",
                 element: this,
                 scrolly: true,
-                items: [this.elm, this.e]
+                items: [this.elm, this.e, {
+
+                }]
             });
 
             this.ne.on("blur", BI.bind(this.blur, this));
@@ -91528,7 +91544,7 @@ BI.extend(BI.DynamicDateCard, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -91767,6 +91783,10 @@ BI.extend(BI.DynamicDateCard, {
         }
     },
 
+    _defaultState: function () {
+
+    },
+
     setValue: function (v) {
         this.storeValue = v;
         this.trigger.setValue(v);
@@ -92410,7 +92430,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -95925,7 +95945,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             height: 24,
             text: "",
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -96481,7 +96504,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             text: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -97477,7 +97503,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -97865,7 +97894,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -98241,7 +98273,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -106769,7 +106804,10 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -107040,7 +107078,10 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

dist/case.js

@@ -5995,6 +5995,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_icon_text_trigger",
+            cls: "icon-text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -6145,7 +6146,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        warningTitle: ""
+        warningTitle: "",
+        attributes: {
+            tabIndex: 0
+        }
     },
 
     render: function () {
@@ -6161,11 +6165,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     ref: function () {
                         self.combo = this;
                     },
-                    attributes: {
-                        tabIndex: 0
-                    },
                     el: {
                         type: "bi.search_text_value_trigger",
+                        cls: "search-text-value-trigger",
                         ref: function () {
                             self.trigger = this;
                         },
@@ -6363,7 +6365,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
+        baseCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 
@@ -6478,7 +6480,10 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
             text: "",
             el: {},
             items: [],
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -6487,7 +6492,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.text_trigger",
-            cls: "bi-border",
+            cls: "bi-border static-text-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -6541,11 +6546,14 @@ BI.shortcut("bi.static_combo", BI.StaticCombo);/**
 BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-text-value-check-combo",
+            baseCls: "bi-text-value-check-combo",
             width: 100,
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -6554,6 +6562,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -6766,6 +6775,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -6967,7 +6977,10 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-text-value-down-list-combo",
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -6983,6 +6996,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         }
         this.trigger = BI.createWidget({
             type: "bi.down_list_select_text_trigger",
+            cls: "text-value-down-list-trigger",
             height: o.height,
             items: o.items,
             text: o.text,
@@ -10979,7 +10993,9 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 type: "bi.default",
                 element: this,
                 scrolly: true,
-                items: [this.elm, this.e]
+                items: [this.elm, this.e, {
+
+                }]
             });
 
             this.ne.on("blur", BI.bind(this.blur, this));

dist/core.css

@@ -313,12 +313,7 @@ textarea {
   color: #606479 !important;
 }
 .bi-focus-shadow:focus-within,
-.bi-focus-shadow:focus {
-  border-color: #3685f2;
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
+.bi-focus-shadow:focus,
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }

dist/core_without_normalize.css

@@ -32,12 +32,7 @@ textarea {
   color: #606479 !important;
 }
 .bi-focus-shadow:focus-within,
-.bi-focus-shadow:focus {
-  border-color: #3685f2;
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
+.bi-focus-shadow:focus,
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }

dist/fineui.css

@@ -313,12 +313,7 @@ textarea {
   color: #606479 !important;
 }
 .bi-focus-shadow:focus-within,
-.bi-focus-shadow:focus {
-  border-color: #3685f2;
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
+.bi-focus-shadow:focus,
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
@@ -2284,12 +2279,6 @@ textarea {
   display: block !important;
   visibility: visible !important;
 }
-.bi-combo.bi-combo-popup:focus,
-.bi-combo.bi-combo-popup:focus-within {
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -2309,20 +2298,42 @@ textarea {
 .bi-search-text-value-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
-.bi-combo:hover > .bi-search-text-value-trigger {
+.bi-search-text-value-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-search-text-value-combo:focus .bi-combo.bi-combo-popup .search-text-value-trigger,
+.bi-search-text-value-combo:focus-within .bi-combo.bi-combo-popup .search-text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-static-combo.bi-combo-popup .static-text-trigger,
+.bi-static-combo:hover .static-text-trigger {
   border-color: #3685f2;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
+.bi-icon-text-value-combo.bi-combo-popup .icon-text-value-trigger,
+.bi-icon-text-value-combo:hover .icon-text-value-trigger {
+  border-color: #3685f2;
+}
 
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
-.bi-combo.bi-combo-popup > .bi-select-text-trigger,
-.bi-combo:hover > .bi-select-text-trigger {
+.bi-text-value-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-check-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-check-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup .text-value-down-list-trigger,
+.bi-text-value-down-list-combo:hover .text-value-down-list-trigger {
   border-color: #3685f2;
 }
 /*************BI.SearchEditor******************/
@@ -4255,8 +4266,11 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
+.bi-multi-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
   border-color: #3685f2;
 }
 
@@ -4275,6 +4289,13 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-insert-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-insert-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {
@@ -4513,7 +4534,30 @@ ul.ztree.zTreeDragUL {
   display: none;
 }
 .bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
+.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger,
+.bi-combo.bi-combo-popup:focus-within > .bi-single-select-trigger {
+  border-color: #3685f2;
+}
+.bi-single-select-combo .single-select-trigger-icon-button {
+  font-size: 16px;
+}
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  display: block;
+}
+.bi-single-select-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-single-select-combo.combo-show .trigger-down {
+  display: none;
+}
+.bi-single-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-single-select-combo:focus .bi-combo.bi-combo-popup .bi-single-select-trigger,
+.bi-single-select-combo:focus-within .bi-combo.bi-combo-popup .bi-single-select-trigger {
   border-color: #3685f2;
 }
 .bi-single-slider-label {

dist/fineui.js

@@ -78900,6 +78900,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_icon_text_trigger",
+            cls: "icon-text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79050,7 +79051,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        warningTitle: ""
+        warningTitle: "",
+        attributes: {
+            tabIndex: 0
+        }
     },
 
     render: function () {
@@ -79066,11 +79070,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     ref: function () {
                         self.combo = this;
                     },
-                    attributes: {
-                        tabIndex: 0
-                    },
                     el: {
                         type: "bi.search_text_value_trigger",
+                        cls: "search-text-value-trigger",
                         ref: function () {
                             self.trigger = this;
                         },
@@ -79268,7 +79270,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
+        baseCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 
@@ -79383,7 +79385,10 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
             text: "",
             el: {},
             items: [],
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -79392,7 +79397,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.text_trigger",
-            cls: "bi-border",
+            cls: "bi-border static-text-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79446,11 +79451,14 @@ BI.shortcut("bi.static_combo", BI.StaticCombo);/**
 BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-text-value-check-combo",
+            baseCls: "bi-text-value-check-combo",
             width: 100,
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -79459,6 +79467,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79671,6 +79680,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,
@@ -79872,7 +79882,10 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-text-value-down-list-combo",
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -79888,6 +79901,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         }
         this.trigger = BI.createWidget({
             type: "bi.down_list_select_text_trigger",
+            cls: "text-value-down-list-trigger",
             height: o.height,
             items: o.items,
             text: o.text,
@@ -83884,7 +83898,9 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 type: "bi.default",
                 element: this,
                 scrolly: true,
-                items: [this.elm, this.e]
+                items: [this.elm, this.e, {
+
+                }]
             });
 
             this.ne.on("blur", BI.bind(this.blur, this));
@@ -91749,7 +91765,7 @@ BI.extend(BI.DynamicDateCard, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -91988,6 +92004,10 @@ BI.extend(BI.DynamicDateCard, {
         }
     },
 
+    _defaultState: function () {
+
+    },
+
     setValue: function (v) {
         this.storeValue = v;
         this.trigger.setValue(v);
@@ -92631,7 +92651,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -96146,7 +96166,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             height: 24,
             text: "",
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -96702,7 +96725,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             text: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -97698,7 +97724,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -98086,7 +98115,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -98462,7 +98494,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -106990,7 +107025,10 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -107261,7 +107299,10 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

dist/widget.css

@@ -117,8 +117,11 @@
 .bi-multi-select-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
+.bi-multi-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
   border-color: #3685f2;
 }
 
@@ -137,6 +140,13 @@
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-insert-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-insert-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {
@@ -375,7 +385,30 @@
   display: none;
 }
 .bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
+.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger,
+.bi-combo.bi-combo-popup:focus-within > .bi-single-select-trigger {
+  border-color: #3685f2;
+}
+.bi-single-select-combo .single-select-trigger-icon-button {
+  font-size: 16px;
+}
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  display: block;
+}
+.bi-single-select-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-single-select-combo.combo-show .trigger-down {
+  display: none;
+}
+.bi-single-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-single-select-combo:focus .bi-combo.bi-combo-popup .bi-single-select-trigger,
+.bi-single-select-combo:focus-within .bi-combo.bi-combo-popup .bi-single-select-trigger {
   border-color: #3685f2;
 }
 .bi-single-slider-label {

dist/widget.js

@@ -3271,7 +3271,7 @@ BI.extend(BI.DynamicDateCard, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -3510,6 +3510,10 @@ BI.extend(BI.DynamicDateCard, {
         }
     },
 
+    _defaultState: function () {
+
+    },
+
     setValue: function (v) {
         this.storeValue = v;
         this.trigger.setValue(v);
@@ -4153,7 +4157,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -7668,7 +7672,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             height: 24,
             text: "",
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -8224,7 +8231,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             text: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -9220,7 +9230,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -9608,7 +9621,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -9984,7 +10000,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -18512,7 +18531,10 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -18783,7 +18805,10 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -21,6 +21,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_icon_text_trigger",
+            cls: "icon-text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -9,7 +9,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        warningTitle: ""
+        warningTitle: "",
+        attributes: {
+            tabIndex: 0
+        }
     },
 
     render: function () {
@@ -25,11 +28,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     ref: function () {
                         self.combo = this;
                     },
-                    attributes: {
-                        tabIndex: 0
-                    },
                     el: {
                         type: "bi.search_text_value_trigger",
+                        cls: "search-text-value-trigger",
                         ref: function () {
                             self.trigger = this;
                         },

src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

@@ -4,7 +4,7 @@
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
+        baseCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 

src/case/combo/staticcombo/combo.static.js

@@ -12,7 +12,10 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
             text: "",
             el: {},
             items: [],
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -21,7 +24,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.text_trigger",
-            cls: "bi-border",
+            cls: "bi-border static-text-trigger",
             items: o.items,
             height: o.height,
             text: o.text,

src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js

@@ -6,11 +6,14 @@
 BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-text-value-check-combo",
+            baseCls: "bi-text-value-check-combo",
             width: 100,
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -19,6 +22,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,

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

@@ -23,6 +23,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
+            cls: "text-value-trigger",
             items: o.items,
             height: o.height,
             text: o.text,

src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js

@@ -6,7 +6,10 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-text-value-down-list-combo",
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -22,6 +25,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         }
         this.trigger = BI.createWidget({
             type: "bi.down_list_select_text_trigger",
+            cls: "text-value-down-list-trigger",
             height: o.height,
             items: o.items,
             text: o.text,

src/case/richeditor/niceditor/niceditor.js

@@ -162,7 +162,9 @@
                 type: "bi.default",
                 element: this,
                 scrolly: true,
-                items: [this.elm, this.e]
+                items: [this.elm, this.e, {
+
+                }]
             });
 
             this.ne.on("blur", BI.bind(this.blur, this));

src/css/base/combo/combo.css

@@ -89,12 +89,6 @@
   display: block !important;
   visibility: visible !important;
 }
-.bi-combo.bi-combo-popup:focus,
-.bi-combo.bi-combo-popup:focus-within {
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -114,19 +108,41 @@
 .bi-search-text-value-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
-.bi-combo:hover > .bi-search-text-value-trigger {
+.bi-search-text-value-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-search-text-value-combo:focus .bi-combo.bi-combo-popup .search-text-value-trigger,
+.bi-search-text-value-combo:focus-within .bi-combo.bi-combo-popup .search-text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-static-combo.bi-combo-popup .static-text-trigger,
+.bi-static-combo:hover .static-text-trigger {
   border-color: #3685f2;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
+.bi-icon-text-value-combo.bi-combo-popup .icon-text-value-trigger,
+.bi-icon-text-value-combo:hover .icon-text-value-trigger {
+  border-color: #3685f2;
+}
 
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
-.bi-combo.bi-combo-popup > .bi-select-text-trigger,
-.bi-combo:hover > .bi-select-text-trigger {
+.bi-text-value-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-check-combo.bi-combo-popup .text-value-trigger,
+.bi-text-value-check-combo:hover .text-value-trigger {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup .text-value-down-list-trigger,
+.bi-text-value-down-list-combo:hover .text-value-down-list-trigger {
   border-color: #3685f2;
 }

src/css/core/utils/common.css

@@ -32,12 +32,7 @@ textarea {
   color: #606479 !important;
 }
 .bi-focus-shadow:focus-within,
-.bi-focus-shadow:focus {
-  border-color: #3685f2;
-  -webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-  -moz-box-shadow: 0 0 5px 2px #d7e7fc;
-  box-shadow: 0 0 5px 2px #d7e7fc;
-}
+.bi-focus-shadow:focus,
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }

src/css/widget/multiselect/multiselect.css

@@ -13,8 +13,11 @@
 .bi-multi-select-combo.combo-show .trigger-down {
   display: none;
 }
-.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
+.bi-multi-select-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
   border-color: #3685f2;
 }
 
@@ -33,6 +36,13 @@
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo:hover .search-text-value-trigger {
+  border-color: #3685f2;
+}
+.bi-multi-select-insert-combo:focus .bi-combo.bi-combo-popup .bi-multi-select-trigger,
+.bi-multi-select-insert-combo:focus-within .bi-combo.bi-combo-popup .bi-multi-select-trigger {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {

src/css/widget/singleselect/multiselect.css

@@ -14,6 +14,7 @@
   display: none;
 }
 .bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
-.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
+.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger,
+.bi-combo.bi-combo-popup:focus-within > .bi-single-select-trigger {
   border-color: #3685f2;
 }

src/less/base/combo/combo.less

@@ -3,8 +3,5 @@
   &.bi-combo-popup {
     display: block !important;
     visibility: visible !important;
-    &:focus, &:focus-within {
-      .box-shadow(0 0 5px 2px, @color-bi-blue-20);
-    }
   }
 }

src/less/base/combo/combo.searchtextvalue.less

@@ -27,10 +27,19 @@
   }
 }
 
-.bi-combo {
-  &.bi-combo-popup, &:hover{
-    & > .bi-search-text-value-trigger {
+.bi-search-text-value-combo {
+  &:hover {
+    & .search-text-value-trigger {
       border-color: @color-bi-border-highlight;
     }
   }
+  &:focus, &:focus-within {
+    & .bi-combo {
+      &.bi-combo-popup {
+        & .search-text-value-trigger {
+          border-color: @color-bi-border-highlight;
+        }
+      }
+    }
+  }
 }

src/less/base/combo/combo.static.less

@@ -0,0 +1,9 @@
+@import "../../index";
+
+.bi-static-combo {
+  &.bi-combo-popup, &:hover {
+    & .static-text-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+}

src/less/base/combo/combo.textvalue.icon.less

@@ -8,4 +8,9 @@
       }
     }
   }
+  &.bi-combo-popup, &:hover {
+    & .icon-text-value-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
 }

src/less/base/combo/combo.textvalue.less

@@ -1,18 +1,15 @@
 @import "../../index";
 
-.bi-text-value-combo{
+.bi-text-value-combo {
   &.combo-error {
     & .bi-select-text-trigger {
-      & .select-text-label{
+      & .select-text-label {
         color: @color-bi-text-failure;
       }
     }
   }
-}
-
-.bi-combo {
-  &.bi-combo-popup, &:hover{
-    & > .bi-select-text-trigger {
+  &.bi-combo-popup, &:hover {
+    & .text-value-trigger {
       border-color: @color-bi-border-highlight;
     }
   }

src/less/base/combo/combo.textvaluecheck.less

@@ -0,0 +1,9 @@
+@import "../../index";
+
+.bi-text-value-check-combo {
+  &.bi-combo-popup, &:hover {
+    & .text-value-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+}

src/less/base/combo/combo.textvaluedownlist.less

@@ -0,0 +1,9 @@
+@import "../../index";
+
+.bi-text-value-down-list-combo {
+  &.bi-combo-popup, &:hover {
+    & .text-value-down-list-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+}

src/less/widget/multiselect/multiselect.combo.less

@@ -18,14 +18,18 @@
       display: none;
     }
   }
-}
-
-.bi-combo {
+  &:hover {
+    & .search-text-value-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+  &:focus, &:focus-within {
+    & .bi-combo {
       &.bi-combo-popup {
-    &:focus, &:hover {
-      & > .bi-multi-select-trigger {
+        & .bi-multi-select-trigger {
           border-color: @color-bi-border-highlight;
         }
       }
     }
+  }
 }

src/less/widget/multiselect/multiselect.insert.combo.less

@@ -18,4 +18,18 @@
       display: none;
     }
   }
+  &:hover {
+    & .search-text-value-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+  &:focus, &:focus-within {
+    & .bi-combo {
+      &.bi-combo-popup {
+        & .bi-multi-select-trigger {
+          border-color: @color-bi-border-highlight;
+        }
+      }
+    }
+  }
 }

src/less/widget/singleselect/singleselect.combo.less

@@ -18,14 +18,18 @@
       display: none;
     }
   }
-}
-
-.bi-combo {
+  &:hover {
+    & .search-text-value-trigger {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+  &:focus, &:focus-within {
+    & .bi-combo {
       &.bi-combo-popup {
-    &:focus, &:hover {
-      & > .bi-single-select-trigger {
+        & .bi-single-select-trigger {
           border-color: @color-bi-border-highlight;
         }
       }
     }
+  }
 }

src/widget/dynamicdate/dynamicdate.combo.js

@@ -9,7 +9,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 
@@ -248,6 +248,10 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
         }
     },
 
+    _defaultState: function () {
+
+    },
+
     setValue: function (v) {
         this.storeValue = v;
         this.trigger.setValue(v);

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -9,7 +9,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo bi-border",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
         height: 24
     },
 

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -11,7 +11,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             height: 24,
             text: "",
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -15,7 +15,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             text: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/widget/multiselect/multiselect.combo.js

@@ -10,7 +10,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/widget/multiselect/multiselect.insert.combo.js

@@ -10,7 +10,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -10,7 +10,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-select-insert-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/widget/singleselect/singleselect.combo.js

@@ -10,7 +10,10 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 

src/widget/singleselect/singleselect.insert.combo.js

@@ -10,7 +10,10 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
             baseCls: "bi-single-select-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },