Merge pull request #570 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'ad205f32aaa8570eaf389777b7923d7e715eeb88':
  update
  update
  update
  改一下改一下
  update
  update
  update
  update

demo/js/case/demo.click.effect.js

@@ -21,15 +21,14 @@ Demo.Func = BI.inherit(BI.Widget, {
             }, {
                 text: "bi-list-item-active2",
                 cls: "bi-list-item-active2 close-font"
-            }, {
-                text: "bi-list-item-active3",
-                cls: "bi-list-item-active3 close-font"
             }, {
                 text: "bi-list-item-select",
                 cls: "bi-list-item-select close-font"
+            }, {
+                text: "bi-list-item-select2",
+                cls: "bi-list-item-select2 close-font"
             }], {
                 type: "bi.icon_text_item",
-                disabled: true,
                 logic: {
                     dynamic: true
                 }

dist/base.css

@@ -63,41 +63,89 @@
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
@@ -350,9 +398,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(-45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-right {
   z-index: 1;
@@ -369,9 +416,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-top {
   z-index: 1;
@@ -388,9 +434,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-bottom {
   z-index: 1;
@@ -407,9 +452,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(-135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
 .bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
@@ -422,11 +466,10 @@
   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-combo.bi-combo-popup > .bi-border,
+.bi-combo.bi-combo-hover > .bi-border,
+.bi-combo:hover > .bi-border {
+  border-color: #3685f2;
 }
 
 .bi-search-text-value-combo .trigger-icon-button {
@@ -447,11 +490,11 @@
 .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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
+
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -459,8 +502,14 @@
 .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-check-combo.bi-combo-popup > .bi-border,
+.bi-text-value-check-combo:hover > .bi-border {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
+.bi-text-value-down-list-combo:hover > .bi-border {
   border-color: #3685f2;
 }
 /*************BI.SearchEditor******************/

dist/base.js

@@ -1644,6 +1644,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
         if(BI.isNotNull(o.value)){
             this.setSelectedValue(o.value);
         }
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     },
 
     _createTree: function () {

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;
 }
@@ -842,6 +837,8 @@ textarea {
 .bi-list-item-active2:hover,
 .bi-list-item-active2.hover {
   color: #232e40;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-list-item-active2:hover .bi-input,
 .bi-list-item-active2.hover .bi-input {
@@ -851,34 +848,19 @@ textarea {
 .bi-list-item-active2.hover .bi-textarea {
   color: #232e40;
 }
-.bi-list-item-active2:hover.bi-border,
-.bi-list-item-active2.hover.bi-border {
-  border-color: #3685f2;
-}
-.bi-list-item-active2:active {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active2:active.bi-border {
-  border-color: #3685f2;
-}
+.bi-list-item-active2:active,
 .bi-list-item-active2.active {
-  color: #ffffff;
-  background-color: #3685f2;
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
+.bi-list-item-active2:active .bi-input,
 .bi-list-item-active2.active .bi-input {
-  color: #ffffff;
+  color: #3685f2;
 }
+.bi-list-item-active2:active .bi-textarea,
 .bi-list-item-active2.active .bi-textarea {
-  color: #ffffff;
-}
-.bi-list-item-active2.active.bi-border {
-  border-color: #3685f2;
+  color: #3685f2;
 }
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
@@ -904,7 +886,8 @@ textarea {
 .bi-theme-dark .bi-list-item-active2:hover,
 .bi-theme-dark .bi-list-item-active2.hover {
   color: #ffffff;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-theme-dark .bi-list-item-active2:hover .bi-input,
 .bi-theme-dark .bi-list-item-active2.hover .bi-input {
@@ -914,17 +897,18 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.hover .bi-textarea {
   color: #ffffff;
 }
-.bi-theme-dark .bi-list-item-active2.active,
-.bi-theme-dark .bi-list-item-active2:active {
+.bi-theme-dark .bi-list-item-active2:active,
+.bi-theme-dark .bi-list-item-active2.active {
   color: #3685f2;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-input,
-.bi-theme-dark .bi-list-item-active2:active .bi-input {
+.bi-theme-dark .bi-list-item-active2:active .bi-input,
+.bi-theme-dark .bi-list-item-active2.active .bi-input {
   color: #3685f2;
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-textarea,
-.bi-theme-dark .bi-list-item-active2:active .bi-textarea {
+.bi-theme-dark .bi-list-item-active2:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active2.active .bi-textarea {
   color: #3685f2;
 }
 .bi-theme-dark .bi-list-item-active2.disabled,
@@ -948,104 +932,6 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #878d9f !important;
 }
-.bi-list-item-active3:hover,
-.bi-list-item-active3.hover {
-  color: #232e40;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:hover .bi-input,
-.bi-list-item-active3.hover .bi-input {
-  color: #232e40;
-}
-.bi-list-item-active3:hover .bi-textarea,
-.bi-list-item-active3.hover .bi-textarea {
-  color: #232e40;
-}
-.bi-list-item-active3:active,
-.bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:active .bi-input,
-.bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active3:active .bi-textarea,
-.bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active3.disabled,
-.bi-list-item-active3.disabled:hover,
-.bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-input,
-.bi-list-item-active3.disabled:hover .bi-input,
-.bi-list-item-active3.disabled:active .bi-input {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-textarea,
-.bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-list-item-active3.disabled:active .bi-textarea {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-high-light,
-.bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-list-item-active3.disabled:active .bi-high-light {
-  color: #9ea6b2 !important;
-}
-.bi-theme-dark .bi-list-item-active3:hover,
-.bi-theme-dark .bi-list-item-active3.hover {
-  color: #ffffff;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.hover .bi-input {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:active,
-.bi-theme-dark .bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-input,
-.bi-theme-dark .bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3.disabled,
-.bi-theme-dark .bi-list-item-active3.disabled:hover,
-.bi-theme-dark .bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
-  color: #878d9f !important;
-}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -1185,29 +1071,134 @@ textarea {
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
-  background-color: #f7f8fa;
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-input,
+.bi-list-item-select2.hover .bi-input {
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-textarea,
+.bi-list-item-select2.hover .bi-textarea {
+  color: #232e40;
+}
+.bi-list-item-select2:hover.bi-border,
+.bi-list-item-select2.hover.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2:active {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select2:active.bi-border {
+  border-color: #3685f2;
 }
-.bi-list-item-select2:active,
 .bi-list-item-select2.active {
   color: #ffffff;
-  background-color: #f7f8fa;
+  background-color: #3685f2;
 }
-.bi-list-item-select2:active .bi-input,
 .bi-list-item-select2.active .bi-input {
-  color: #3685f2;
+  color: #ffffff;
 }
-.bi-list-item-select2:active .bi-textarea,
 .bi-list-item-select2.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-select2:active .bi-high-light,
-.bi-list-item-select2.active .bi-high-light {
   color: #ffffff;
 }
+.bi-list-item-select2.active.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2.disabled,
 .bi-list-item-select2.disabled:hover,
-.bi-list-item-select2.disabled.hover,
-.bi-list-item-select2.disabled:active,
-.bi-list-item-select2.disabled.active {
+.bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-input,
+.bi-list-item-select2.disabled:hover .bi-input,
+.bi-list-item-select2.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-textarea,
+.bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-list-item-select2.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-high-light,
+.bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-list-item-select2.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
+.bi-theme-dark .bi-list-item-select2:hover,
+.bi-theme-dark .bi-list-item-select2.hover {
+  color: #ffffff;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2.active,
+.bi-theme-dark .bi-list-item-select2:active {
+  color: #3685f2;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-input,
+.bi-theme-dark .bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
+.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.disabled,
+.bi-theme-dark .bi-list-item-select2.disabled:hover,
+.bi-theme-dark .bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
+.bi-list-item-select3:hover,
+.bi-list-item-select3.hover {
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active,
+.bi-list-item-select3.active {
+  color: #3685f2;
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active .bi-input,
+.bi-list-item-select3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select3:active .bi-textarea,
+.bi-list-item-select3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select3.disabled:hover,
+.bi-list-item-select3.disabled.hover,
+.bi-list-item-select3.disabled:active,
+.bi-list-item-select3.disabled.active {
   background-color: #ffffff !important;
 }
 .bi-theme-dark .bi-list-item-select:hover,
@@ -1925,41 +1916,89 @@ textarea {
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
@@ -2212,9 +2251,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(-45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-right {
   z-index: 1;
@@ -2231,9 +2269,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-top {
   z-index: 1;
@@ -2250,9 +2287,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-bottom {
   z-index: 1;
@@ -2269,9 +2305,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(-135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
 .bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
@@ -2284,11 +2319,10 @@ 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-combo.bi-combo-popup > .bi-border,
+.bi-combo.bi-combo-hover > .bi-border,
+.bi-combo:hover > .bi-border {
+  border-color: #3685f2;
 }
 
 .bi-search-text-value-combo .trigger-icon-button {
@@ -2309,11 +2343,11 @@ 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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
+
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -2321,8 +2355,14 @@ textarea {
 .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-check-combo.bi-combo-popup > .bi-border,
+.bi-text-value-check-combo:hover > .bi-border {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
+.bi-text-value-down-list-combo:hover > .bi-border {
   border-color: #3685f2;
 }
 /*************BI.SearchEditor******************/
@@ -4255,8 +4295,7 @@ 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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
@@ -4275,6 +4314,9 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {
@@ -4513,7 +4555,26 @@ 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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 .bi-single-slider-label {
@@ -4736,41 +4797,89 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;

dist/bundle.js

@@ -27448,7 +27448,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.visible();
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
-        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
+        // scale影响要计算在内
+        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }
@@ -37566,6 +37568,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
         if(BI.isNotNull(o.value)){
             this.setSelectedValue(o.value);
         }
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     },
 
     _createTree: function () {
@@ -78679,6 +78684,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 +78835,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        warningTitle: ""
+        warningTitle: "",
+        attributes: {
+            tabIndex: 0
+        }
     },
 
     render: function () {
@@ -78845,11 +78854,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 +79054,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 +79169,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 +79181,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 +79235,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 +79251,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 +79464,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 +79666,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 +79685,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,
@@ -91528,7 +91547,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 +91786,10 @@ BI.extend(BI.DynamicDateCard, {
         }
     },
 
+    _defaultState: function () {
+
+    },
+
     setValue: function (v) {
         this.storeValue = v;
         this.trigger.setValue(v);
@@ -92410,7 +92433,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 +95948,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             height: 24,
             text: "",
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -96481,7 +96507,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             text: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -97477,7 +97506,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 +97897,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 +98276,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
+            }
         });
     },
 
@@ -102528,7 +102566,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             forceNotSelected: true,
             trigger: "lclick,",
-            cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(o.step);
@@ -102539,7 +102577,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             trigger: "lclick,",
             forceNotSelected: true,
-            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(-o.step);
@@ -106769,7 +106807,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 +107081,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
+            }
         });
     },
 
@@ -108494,7 +108538,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select2",
+                    cls: "slider-button bi-list-item-select3",
                     ref: function () {
                         self.slider = this;
                     }
@@ -110331,7 +110375,7 @@ BI.StaticYearCard.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-combo bi-border",
+        baseCls: "bi-year-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -111064,7 +111108,7 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);
 BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
 
     props: {
-        baseCls: "bi-year-month-combo  bi-border",
+        baseCls: "bi-year-month-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -112092,7 +112136,7 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);
 BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-quarter-combo bi-border",
+        baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期

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,

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;
 }
@@ -842,6 +837,8 @@ textarea {
 .bi-list-item-active2:hover,
 .bi-list-item-active2.hover {
   color: #232e40;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-list-item-active2:hover .bi-input,
 .bi-list-item-active2.hover .bi-input {
@@ -851,34 +848,19 @@ textarea {
 .bi-list-item-active2.hover .bi-textarea {
   color: #232e40;
 }
-.bi-list-item-active2:hover.bi-border,
-.bi-list-item-active2.hover.bi-border {
-  border-color: #3685f2;
-}
-.bi-list-item-active2:active {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active2:active.bi-border {
-  border-color: #3685f2;
-}
+.bi-list-item-active2:active,
 .bi-list-item-active2.active {
-  color: #ffffff;
-  background-color: #3685f2;
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
+.bi-list-item-active2:active .bi-input,
 .bi-list-item-active2.active .bi-input {
-  color: #ffffff;
+  color: #3685f2;
 }
+.bi-list-item-active2:active .bi-textarea,
 .bi-list-item-active2.active .bi-textarea {
-  color: #ffffff;
-}
-.bi-list-item-active2.active.bi-border {
-  border-color: #3685f2;
+  color: #3685f2;
 }
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
@@ -904,7 +886,8 @@ textarea {
 .bi-theme-dark .bi-list-item-active2:hover,
 .bi-theme-dark .bi-list-item-active2.hover {
   color: #ffffff;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-theme-dark .bi-list-item-active2:hover .bi-input,
 .bi-theme-dark .bi-list-item-active2.hover .bi-input {
@@ -914,17 +897,18 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.hover .bi-textarea {
   color: #ffffff;
 }
-.bi-theme-dark .bi-list-item-active2.active,
-.bi-theme-dark .bi-list-item-active2:active {
+.bi-theme-dark .bi-list-item-active2:active,
+.bi-theme-dark .bi-list-item-active2.active {
   color: #3685f2;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-input,
-.bi-theme-dark .bi-list-item-active2:active .bi-input {
+.bi-theme-dark .bi-list-item-active2:active .bi-input,
+.bi-theme-dark .bi-list-item-active2.active .bi-input {
   color: #3685f2;
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-textarea,
-.bi-theme-dark .bi-list-item-active2:active .bi-textarea {
+.bi-theme-dark .bi-list-item-active2:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active2.active .bi-textarea {
   color: #3685f2;
 }
 .bi-theme-dark .bi-list-item-active2.disabled,
@@ -948,104 +932,6 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #878d9f !important;
 }
-.bi-list-item-active3:hover,
-.bi-list-item-active3.hover {
-  color: #232e40;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:hover .bi-input,
-.bi-list-item-active3.hover .bi-input {
-  color: #232e40;
-}
-.bi-list-item-active3:hover .bi-textarea,
-.bi-list-item-active3.hover .bi-textarea {
-  color: #232e40;
-}
-.bi-list-item-active3:active,
-.bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:active .bi-input,
-.bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active3:active .bi-textarea,
-.bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active3.disabled,
-.bi-list-item-active3.disabled:hover,
-.bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-input,
-.bi-list-item-active3.disabled:hover .bi-input,
-.bi-list-item-active3.disabled:active .bi-input {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-textarea,
-.bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-list-item-active3.disabled:active .bi-textarea {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-high-light,
-.bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-list-item-active3.disabled:active .bi-high-light {
-  color: #9ea6b2 !important;
-}
-.bi-theme-dark .bi-list-item-active3:hover,
-.bi-theme-dark .bi-list-item-active3.hover {
-  color: #ffffff;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.hover .bi-input {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:active,
-.bi-theme-dark .bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-input,
-.bi-theme-dark .bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3.disabled,
-.bi-theme-dark .bi-list-item-active3.disabled:hover,
-.bi-theme-dark .bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
-  color: #878d9f !important;
-}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -1185,29 +1071,134 @@ textarea {
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
-  background-color: #f7f8fa;
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-input,
+.bi-list-item-select2.hover .bi-input {
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-textarea,
+.bi-list-item-select2.hover .bi-textarea {
+  color: #232e40;
+}
+.bi-list-item-select2:hover.bi-border,
+.bi-list-item-select2.hover.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2:active {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select2:active.bi-border {
+  border-color: #3685f2;
 }
-.bi-list-item-select2:active,
 .bi-list-item-select2.active {
   color: #ffffff;
-  background-color: #f7f8fa;
+  background-color: #3685f2;
 }
-.bi-list-item-select2:active .bi-input,
 .bi-list-item-select2.active .bi-input {
-  color: #3685f2;
+  color: #ffffff;
 }
-.bi-list-item-select2:active .bi-textarea,
 .bi-list-item-select2.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-select2:active .bi-high-light,
-.bi-list-item-select2.active .bi-high-light {
   color: #ffffff;
 }
+.bi-list-item-select2.active.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2.disabled,
 .bi-list-item-select2.disabled:hover,
-.bi-list-item-select2.disabled.hover,
-.bi-list-item-select2.disabled:active,
-.bi-list-item-select2.disabled.active {
+.bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-input,
+.bi-list-item-select2.disabled:hover .bi-input,
+.bi-list-item-select2.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-textarea,
+.bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-list-item-select2.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-high-light,
+.bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-list-item-select2.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
+.bi-theme-dark .bi-list-item-select2:hover,
+.bi-theme-dark .bi-list-item-select2.hover {
+  color: #ffffff;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2.active,
+.bi-theme-dark .bi-list-item-select2:active {
+  color: #3685f2;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-input,
+.bi-theme-dark .bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
+.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.disabled,
+.bi-theme-dark .bi-list-item-select2.disabled:hover,
+.bi-theme-dark .bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
+.bi-list-item-select3:hover,
+.bi-list-item-select3.hover {
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active,
+.bi-list-item-select3.active {
+  color: #3685f2;
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active .bi-input,
+.bi-list-item-select3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select3:active .bi-textarea,
+.bi-list-item-select3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select3.disabled:hover,
+.bi-list-item-select3.disabled.hover,
+.bi-list-item-select3.disabled:active,
+.bi-list-item-select3.disabled.active {
   background-color: #ffffff !important;
 }
 .bi-theme-dark .bi-list-item-select:hover,

dist/core.js

@@ -27448,7 +27448,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.visible();
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
-        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
+        // scale影响要计算在内
+        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }

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;
 }
@@ -561,6 +556,8 @@ textarea {
 .bi-list-item-active2:hover,
 .bi-list-item-active2.hover {
   color: #232e40;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-list-item-active2:hover .bi-input,
 .bi-list-item-active2.hover .bi-input {
@@ -570,34 +567,19 @@ textarea {
 .bi-list-item-active2.hover .bi-textarea {
   color: #232e40;
 }
-.bi-list-item-active2:hover.bi-border,
-.bi-list-item-active2.hover.bi-border {
-  border-color: #3685f2;
-}
-.bi-list-item-active2:active {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active2:active.bi-border {
-  border-color: #3685f2;
-}
+.bi-list-item-active2:active,
 .bi-list-item-active2.active {
-  color: #ffffff;
-  background-color: #3685f2;
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
+.bi-list-item-active2:active .bi-input,
 .bi-list-item-active2.active .bi-input {
-  color: #ffffff;
+  color: #3685f2;
 }
+.bi-list-item-active2:active .bi-textarea,
 .bi-list-item-active2.active .bi-textarea {
-  color: #ffffff;
-}
-.bi-list-item-active2.active.bi-border {
-  border-color: #3685f2;
+  color: #3685f2;
 }
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
@@ -623,7 +605,8 @@ textarea {
 .bi-theme-dark .bi-list-item-active2:hover,
 .bi-theme-dark .bi-list-item-active2.hover {
   color: #ffffff;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-theme-dark .bi-list-item-active2:hover .bi-input,
 .bi-theme-dark .bi-list-item-active2.hover .bi-input {
@@ -633,17 +616,18 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.hover .bi-textarea {
   color: #ffffff;
 }
-.bi-theme-dark .bi-list-item-active2.active,
-.bi-theme-dark .bi-list-item-active2:active {
+.bi-theme-dark .bi-list-item-active2:active,
+.bi-theme-dark .bi-list-item-active2.active {
   color: #3685f2;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-input,
-.bi-theme-dark .bi-list-item-active2:active .bi-input {
+.bi-theme-dark .bi-list-item-active2:active .bi-input,
+.bi-theme-dark .bi-list-item-active2.active .bi-input {
   color: #3685f2;
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-textarea,
-.bi-theme-dark .bi-list-item-active2:active .bi-textarea {
+.bi-theme-dark .bi-list-item-active2:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active2.active .bi-textarea {
   color: #3685f2;
 }
 .bi-theme-dark .bi-list-item-active2.disabled,
@@ -667,104 +651,6 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #878d9f !important;
 }
-.bi-list-item-active3:hover,
-.bi-list-item-active3.hover {
-  color: #232e40;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:hover .bi-input,
-.bi-list-item-active3.hover .bi-input {
-  color: #232e40;
-}
-.bi-list-item-active3:hover .bi-textarea,
-.bi-list-item-active3.hover .bi-textarea {
-  color: #232e40;
-}
-.bi-list-item-active3:active,
-.bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:active .bi-input,
-.bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active3:active .bi-textarea,
-.bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active3.disabled,
-.bi-list-item-active3.disabled:hover,
-.bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-input,
-.bi-list-item-active3.disabled:hover .bi-input,
-.bi-list-item-active3.disabled:active .bi-input {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-textarea,
-.bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-list-item-active3.disabled:active .bi-textarea {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-high-light,
-.bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-list-item-active3.disabled:active .bi-high-light {
-  color: #9ea6b2 !important;
-}
-.bi-theme-dark .bi-list-item-active3:hover,
-.bi-theme-dark .bi-list-item-active3.hover {
-  color: #ffffff;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.hover .bi-input {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:active,
-.bi-theme-dark .bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-input,
-.bi-theme-dark .bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3.disabled,
-.bi-theme-dark .bi-list-item-active3.disabled:hover,
-.bi-theme-dark .bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
-  color: #878d9f !important;
-}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -904,29 +790,134 @@ textarea {
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
-  background-color: #f7f8fa;
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-input,
+.bi-list-item-select2.hover .bi-input {
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-textarea,
+.bi-list-item-select2.hover .bi-textarea {
+  color: #232e40;
+}
+.bi-list-item-select2:hover.bi-border,
+.bi-list-item-select2.hover.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2:active {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select2:active.bi-border {
+  border-color: #3685f2;
 }
-.bi-list-item-select2:active,
 .bi-list-item-select2.active {
   color: #ffffff;
-  background-color: #f7f8fa;
+  background-color: #3685f2;
 }
-.bi-list-item-select2:active .bi-input,
 .bi-list-item-select2.active .bi-input {
-  color: #3685f2;
+  color: #ffffff;
 }
-.bi-list-item-select2:active .bi-textarea,
 .bi-list-item-select2.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-select2:active .bi-high-light,
-.bi-list-item-select2.active .bi-high-light {
   color: #ffffff;
 }
+.bi-list-item-select2.active.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2.disabled,
 .bi-list-item-select2.disabled:hover,
-.bi-list-item-select2.disabled.hover,
-.bi-list-item-select2.disabled:active,
-.bi-list-item-select2.disabled.active {
+.bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-input,
+.bi-list-item-select2.disabled:hover .bi-input,
+.bi-list-item-select2.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-textarea,
+.bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-list-item-select2.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-high-light,
+.bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-list-item-select2.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
+.bi-theme-dark .bi-list-item-select2:hover,
+.bi-theme-dark .bi-list-item-select2.hover {
+  color: #ffffff;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2.active,
+.bi-theme-dark .bi-list-item-select2:active {
+  color: #3685f2;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-input,
+.bi-theme-dark .bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
+.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.disabled,
+.bi-theme-dark .bi-list-item-select2.disabled:hover,
+.bi-theme-dark .bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
+.bi-list-item-select3:hover,
+.bi-list-item-select3.hover {
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active,
+.bi-list-item-select3.active {
+  color: #3685f2;
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active .bi-input,
+.bi-list-item-select3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select3:active .bi-textarea,
+.bi-list-item-select3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select3.disabled:hover,
+.bi-list-item-select3.disabled.hover,
+.bi-list-item-select3.disabled:active,
+.bi-list-item-select3.disabled.active {
   background-color: #ffffff !important;
 }
 .bi-theme-dark .bi-list-item-select:hover,

dist/demo.js

@@ -2436,15 +2436,14 @@ BI.shortcut("demo.calendar", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
             }, {
                 text: "bi-list-item-active2",
                 cls: "bi-list-item-active2 close-font"
-            }, {
-                text: "bi-list-item-active3",
-                cls: "bi-list-item-active3 close-font"
             }, {
                 text: "bi-list-item-select",
                 cls: "bi-list-item-select close-font"
+            }, {
+                text: "bi-list-item-select2",
+                cls: "bi-list-item-select2 close-font"
             }], {
                 type: "bi.icon_text_item",
-                disabled: true,
                 logic: {
                     dynamic: true
                 }

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;
 }
@@ -842,6 +837,8 @@ textarea {
 .bi-list-item-active2:hover,
 .bi-list-item-active2.hover {
   color: #232e40;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-list-item-active2:hover .bi-input,
 .bi-list-item-active2.hover .bi-input {
@@ -851,34 +848,19 @@ textarea {
 .bi-list-item-active2.hover .bi-textarea {
   color: #232e40;
 }
-.bi-list-item-active2:hover.bi-border,
-.bi-list-item-active2.hover.bi-border {
-  border-color: #3685f2;
-}
-.bi-list-item-active2:active {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active2:active.bi-border {
-  border-color: #3685f2;
-}
+.bi-list-item-active2:active,
 .bi-list-item-active2.active {
-  color: #ffffff;
-  background-color: #3685f2;
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
+.bi-list-item-active2:active .bi-input,
 .bi-list-item-active2.active .bi-input {
-  color: #ffffff;
+  color: #3685f2;
 }
+.bi-list-item-active2:active .bi-textarea,
 .bi-list-item-active2.active .bi-textarea {
-  color: #ffffff;
-}
-.bi-list-item-active2.active.bi-border {
-  border-color: #3685f2;
+  color: #3685f2;
 }
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
@@ -904,7 +886,8 @@ textarea {
 .bi-theme-dark .bi-list-item-active2:hover,
 .bi-theme-dark .bi-list-item-active2.hover {
   color: #ffffff;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-theme-dark .bi-list-item-active2:hover .bi-input,
 .bi-theme-dark .bi-list-item-active2.hover .bi-input {
@@ -914,17 +897,18 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.hover .bi-textarea {
   color: #ffffff;
 }
-.bi-theme-dark .bi-list-item-active2.active,
-.bi-theme-dark .bi-list-item-active2:active {
+.bi-theme-dark .bi-list-item-active2:active,
+.bi-theme-dark .bi-list-item-active2.active {
   color: #3685f2;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-input,
-.bi-theme-dark .bi-list-item-active2:active .bi-input {
+.bi-theme-dark .bi-list-item-active2:active .bi-input,
+.bi-theme-dark .bi-list-item-active2.active .bi-input {
   color: #3685f2;
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-textarea,
-.bi-theme-dark .bi-list-item-active2:active .bi-textarea {
+.bi-theme-dark .bi-list-item-active2:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active2.active .bi-textarea {
   color: #3685f2;
 }
 .bi-theme-dark .bi-list-item-active2.disabled,
@@ -948,104 +932,6 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #878d9f !important;
 }
-.bi-list-item-active3:hover,
-.bi-list-item-active3.hover {
-  color: #232e40;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:hover .bi-input,
-.bi-list-item-active3.hover .bi-input {
-  color: #232e40;
-}
-.bi-list-item-active3:hover .bi-textarea,
-.bi-list-item-active3.hover .bi-textarea {
-  color: #232e40;
-}
-.bi-list-item-active3:active,
-.bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:active .bi-input,
-.bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active3:active .bi-textarea,
-.bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active3.disabled,
-.bi-list-item-active3.disabled:hover,
-.bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-input,
-.bi-list-item-active3.disabled:hover .bi-input,
-.bi-list-item-active3.disabled:active .bi-input {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-textarea,
-.bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-list-item-active3.disabled:active .bi-textarea {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-high-light,
-.bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-list-item-active3.disabled:active .bi-high-light {
-  color: #9ea6b2 !important;
-}
-.bi-theme-dark .bi-list-item-active3:hover,
-.bi-theme-dark .bi-list-item-active3.hover {
-  color: #ffffff;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.hover .bi-input {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:active,
-.bi-theme-dark .bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-input,
-.bi-theme-dark .bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3.disabled,
-.bi-theme-dark .bi-list-item-active3.disabled:hover,
-.bi-theme-dark .bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
-  color: #878d9f !important;
-}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -1185,29 +1071,134 @@ textarea {
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
-  background-color: #f7f8fa;
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-input,
+.bi-list-item-select2.hover .bi-input {
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-textarea,
+.bi-list-item-select2.hover .bi-textarea {
+  color: #232e40;
+}
+.bi-list-item-select2:hover.bi-border,
+.bi-list-item-select2.hover.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2:active {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select2:active.bi-border {
+  border-color: #3685f2;
 }
-.bi-list-item-select2:active,
 .bi-list-item-select2.active {
   color: #ffffff;
-  background-color: #f7f8fa;
+  background-color: #3685f2;
 }
-.bi-list-item-select2:active .bi-input,
 .bi-list-item-select2.active .bi-input {
-  color: #3685f2;
+  color: #ffffff;
 }
-.bi-list-item-select2:active .bi-textarea,
 .bi-list-item-select2.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-select2:active .bi-high-light,
-.bi-list-item-select2.active .bi-high-light {
   color: #ffffff;
 }
+.bi-list-item-select2.active.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2.disabled,
 .bi-list-item-select2.disabled:hover,
-.bi-list-item-select2.disabled.hover,
-.bi-list-item-select2.disabled:active,
-.bi-list-item-select2.disabled.active {
+.bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-input,
+.bi-list-item-select2.disabled:hover .bi-input,
+.bi-list-item-select2.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-textarea,
+.bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-list-item-select2.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-high-light,
+.bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-list-item-select2.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
+.bi-theme-dark .bi-list-item-select2:hover,
+.bi-theme-dark .bi-list-item-select2.hover {
+  color: #ffffff;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2.active,
+.bi-theme-dark .bi-list-item-select2:active {
+  color: #3685f2;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-input,
+.bi-theme-dark .bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
+.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.disabled,
+.bi-theme-dark .bi-list-item-select2.disabled:hover,
+.bi-theme-dark .bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
+.bi-list-item-select3:hover,
+.bi-list-item-select3.hover {
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active,
+.bi-list-item-select3.active {
+  color: #3685f2;
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active .bi-input,
+.bi-list-item-select3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select3:active .bi-textarea,
+.bi-list-item-select3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select3.disabled:hover,
+.bi-list-item-select3.disabled.hover,
+.bi-list-item-select3.disabled:active,
+.bi-list-item-select3.disabled.active {
   background-color: #ffffff !important;
 }
 .bi-theme-dark .bi-list-item-select:hover,
@@ -1925,41 +1916,89 @@ textarea {
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
@@ -2212,9 +2251,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(-45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-right {
   z-index: 1;
@@ -2231,9 +2269,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-top {
   z-index: 1;
@@ -2250,9 +2287,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-bottom {
   z-index: 1;
@@ -2269,9 +2305,8 @@ textarea {
   content: "";
   background-color: #ffffff;
   transform: rotate(-135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
 .bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
@@ -2284,11 +2319,10 @@ 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-combo.bi-combo-popup > .bi-border,
+.bi-combo.bi-combo-hover > .bi-border,
+.bi-combo:hover > .bi-border {
+  border-color: #3685f2;
 }
 
 .bi-search-text-value-combo .trigger-icon-button {
@@ -2309,11 +2343,11 @@ 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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
+
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -2321,8 +2355,14 @@ textarea {
 .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-check-combo.bi-combo-popup > .bi-border,
+.bi-text-value-check-combo:hover > .bi-border {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
+.bi-text-value-down-list-combo:hover > .bi-border {
   border-color: #3685f2;
 }
 /*************BI.SearchEditor******************/
@@ -4255,8 +4295,7 @@ 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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
@@ -4275,6 +4314,9 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {
@@ -4513,7 +4555,26 @@ 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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 .bi-single-slider-label {
@@ -4736,41 +4797,89 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;

dist/fineui.js

@@ -27669,7 +27669,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.visible();
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
-        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
+        // scale影响要计算在内
+        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }
@@ -37787,6 +37789,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
         if(BI.isNotNull(o.value)){
             this.setSelectedValue(o.value);
         }
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     },
 
     _createTree: function () {
@@ -78900,6 +78905,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 +79056,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        warningTitle: ""
+        warningTitle: "",
+        attributes: {
+            tabIndex: 0
+        }
     },
 
     render: function () {
@@ -79066,11 +79075,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 +79275,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 +79390,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 +79402,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 +79456,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 +79472,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 +79685,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 +79887,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 +79906,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,
@@ -91749,7 +91768,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 +92007,10 @@ BI.extend(BI.DynamicDateCard, {
         }
     },
 
+    _defaultState: function () {
+
+    },
+
     setValue: function (v) {
         this.storeValue = v;
         this.trigger.setValue(v);
@@ -92631,7 +92654,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 +96169,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             height: 24,
             text: "",
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -96702,7 +96728,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             text: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: ""
+            value: "",
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -97698,7 +97727,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 +98118,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 +98497,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
+            }
         });
     },
 
@@ -102749,7 +102787,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             forceNotSelected: true,
             trigger: "lclick,",
-            cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(o.step);
@@ -102760,7 +102798,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             trigger: "lclick,",
             forceNotSelected: true,
-            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(-o.step);
@@ -106990,7 +107028,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 +107302,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
+            }
         });
     },
 
@@ -108715,7 +108759,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select2",
+                    cls: "slider-button bi-list-item-select3",
                     ref: function () {
                         self.slider = this;
                     }
@@ -110552,7 +110596,7 @@ BI.StaticYearCard.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-combo bi-border",
+        baseCls: "bi-year-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -111285,7 +111329,7 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);
 BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
 
     props: {
-        baseCls: "bi-year-month-combo  bi-border",
+        baseCls: "bi-year-month-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -112313,7 +112357,7 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);
 BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-quarter-combo bi-border",
+        baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期

dist/resource.css

@@ -110,41 +110,89 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;

dist/widget.css

@@ -117,8 +117,7 @@
 .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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
@@ -137,6 +136,9 @@
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
+  border-color: #3685f2;
+}
 
 
 .bi-multi-select-trigger {
@@ -375,7 +377,26 @@
   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 .bi-combo-hover > .bi-border {
   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
+            }
         });
     },
 
@@ -14271,7 +14290,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             forceNotSelected: true,
             trigger: "lclick,",
-            cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(o.step);
@@ -14282,7 +14301,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             trigger: "lclick,",
             forceNotSelected: true,
-            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(-o.step);
@@ -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
+            }
         });
     },
 
@@ -20237,7 +20262,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select2",
+                    cls: "slider-button bi-list-item-select3",
                     ref: function () {
                         self.slider = this;
                     }
@@ -22074,7 +22099,7 @@ BI.StaticYearCard.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-combo bi-border",
+        baseCls: "bi-year-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -22807,7 +22832,7 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);
 BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
 
     props: {
-        baseCls: "bi-year-month-combo  bi-border",
+        baseCls: "bi-year-month-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -23835,7 +23860,7 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);
 BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-quarter-combo bi-border",
+        baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期

public/css/background.css

@@ -39,41 +39,89 @@
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/half_selected.png');
   _background: none;

src/base/tree/treeview.js

@@ -33,6 +33,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
         if(BI.isNotNull(o.value)){
             this.setSelectedValue(o.value);
         }
+        if (BI.isIE9Below()) {
+            this.element.addClass("hack");
+        }
     },
 
     _createTree: function () {

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/core/controller/controller.tooltips.js

@@ -85,7 +85,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         tooltip.visible();
         tooltip.element.height(tooltip.element[0].scrollHeight);
         this.showingTips[name] = true;
-        var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
+        // scale影响要计算在内
+        var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
+        var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
         if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
             x -= tooltip.element.outerWidth() + 15;
         }

src/css/base/colorchooser/colorpicker/editor.css

@@ -39,41 +39,89 @@
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;

src/css/base/combo/combo.css

@@ -17,9 +17,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(-45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-right {
   z-index: 1;
@@ -36,9 +35,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-top {
   z-index: 1;
@@ -55,9 +53,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(45deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-bubble-combo .bubble-combo-triangle-bottom {
   z-index: 1;
@@ -74,9 +71,8 @@
   content: "";
   background-color: #ffffff;
   transform: rotate(-135deg);
-  -webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  -moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-  box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
+  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #f2f4f7;
 }
 .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
 .bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
@@ -89,11 +85,10 @@
   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-combo.bi-combo-popup > .bi-border,
+.bi-combo.bi-combo-hover > .bi-border,
+.bi-combo:hover > .bi-border {
+  border-color: #3685f2;
 }
 
 .bi-search-text-value-combo .trigger-icon-button {
@@ -114,11 +109,11 @@
 .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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
+
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -126,7 +121,13 @@
 .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-check-combo.bi-combo-popup > .bi-border,
+.bi-text-value-check-combo:hover > .bi-border {
+  border-color: #3685f2;
+}
+
+.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
+.bi-text-value-down-list-combo:hover > .bi-border {
   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;
 }
@@ -561,6 +556,8 @@ textarea {
 .bi-list-item-active2:hover,
 .bi-list-item-active2.hover {
   color: #232e40;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-list-item-active2:hover .bi-input,
 .bi-list-item-active2.hover .bi-input {
@@ -570,34 +567,19 @@ textarea {
 .bi-list-item-active2.hover .bi-textarea {
   color: #232e40;
 }
-.bi-list-item-active2:hover.bi-border,
-.bi-list-item-active2.hover.bi-border {
-  border-color: #3685f2;
-}
-.bi-list-item-active2:active {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active2:active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active2:active.bi-border {
-  border-color: #3685f2;
-}
+.bi-list-item-active2:active,
 .bi-list-item-active2.active {
-  color: #ffffff;
-  background-color: #3685f2;
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
+.bi-list-item-active2:active .bi-input,
 .bi-list-item-active2.active .bi-input {
-  color: #ffffff;
+  color: #3685f2;
 }
+.bi-list-item-active2:active .bi-textarea,
 .bi-list-item-active2.active .bi-textarea {
-  color: #ffffff;
-}
-.bi-list-item-active2.active.bi-border {
-  border-color: #3685f2;
+  color: #3685f2;
 }
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
@@ -623,7 +605,8 @@ textarea {
 .bi-theme-dark .bi-list-item-active2:hover,
 .bi-theme-dark .bi-list-item-active2.hover {
   color: #ffffff;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
 .bi-theme-dark .bi-list-item-active2:hover .bi-input,
 .bi-theme-dark .bi-list-item-active2.hover .bi-input {
@@ -633,17 +616,18 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.hover .bi-textarea {
   color: #ffffff;
 }
-.bi-theme-dark .bi-list-item-active2.active,
-.bi-theme-dark .bi-list-item-active2:active {
+.bi-theme-dark .bi-list-item-active2:active,
+.bi-theme-dark .bi-list-item-active2.active {
   color: #3685f2;
-  background-color: #242640;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-input,
-.bi-theme-dark .bi-list-item-active2:active .bi-input {
+.bi-theme-dark .bi-list-item-active2:active .bi-input,
+.bi-theme-dark .bi-list-item-active2.active .bi-input {
   color: #3685f2;
 }
-.bi-theme-dark .bi-list-item-active2.active .bi-textarea,
-.bi-theme-dark .bi-list-item-active2:active .bi-textarea {
+.bi-theme-dark .bi-list-item-active2:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active2.active .bi-textarea {
   color: #3685f2;
 }
 .bi-theme-dark .bi-list-item-active2.disabled,
@@ -667,104 +651,6 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #878d9f !important;
 }
-.bi-list-item-active3:hover,
-.bi-list-item-active3.hover {
-  color: #232e40;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:hover .bi-input,
-.bi-list-item-active3.hover .bi-input {
-  color: #232e40;
-}
-.bi-list-item-active3:hover .bi-textarea,
-.bi-list-item-active3.hover .bi-textarea {
-  color: #232e40;
-}
-.bi-list-item-active3:active,
-.bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-list-item-active3:active .bi-input,
-.bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-list-item-active3:active .bi-textarea,
-.bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-active3.disabled,
-.bi-list-item-active3.disabled:hover,
-.bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-input,
-.bi-list-item-active3.disabled:hover .bi-input,
-.bi-list-item-active3.disabled:active .bi-input {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-textarea,
-.bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-list-item-active3.disabled:active .bi-textarea {
-  color: #9ea6b2 !important;
-}
-.bi-list-item-active3.disabled .bi-high-light,
-.bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-list-item-active3.disabled:active .bi-high-light {
-  color: #9ea6b2 !important;
-}
-.bi-theme-dark .bi-list-item-active3:hover,
-.bi-theme-dark .bi-list-item-active3.hover {
-  color: #ffffff;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.hover .bi-input {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
-  color: #ffffff;
-}
-.bi-theme-dark .bi-list-item-active3:active,
-.bi-theme-dark .bi-list-item-active3.active {
-  color: #3685f2;
-  background-color: rgba(54, 133, 242, 0.06);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-input,
-.bi-theme-dark .bi-list-item-active3.active .bi-input {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-theme-dark .bi-list-item-active3.disabled,
-.bi-theme-dark .bi-list-item-active3.disabled:hover,
-.bi-theme-dark .bi-list-item-active3.disabled:active {
-  background-color: transparent !important;
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
-  color: #878d9f !important;
-}
-.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
-.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
-  color: #878d9f !important;
-}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -904,29 +790,134 @@ textarea {
 }
 .bi-list-item-select2:hover,
 .bi-list-item-select2.hover {
-  background-color: #f7f8fa;
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-input,
+.bi-list-item-select2.hover .bi-input {
+  color: #232e40;
+}
+.bi-list-item-select2:hover .bi-textarea,
+.bi-list-item-select2.hover .bi-textarea {
+  color: #232e40;
+}
+.bi-list-item-select2:hover.bi-border,
+.bi-list-item-select2.hover.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2:active {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select2:active.bi-border {
+  border-color: #3685f2;
 }
-.bi-list-item-select2:active,
 .bi-list-item-select2.active {
   color: #ffffff;
-  background-color: #f7f8fa;
+  background-color: #3685f2;
 }
-.bi-list-item-select2:active .bi-input,
 .bi-list-item-select2.active .bi-input {
-  color: #3685f2;
+  color: #ffffff;
 }
-.bi-list-item-select2:active .bi-textarea,
 .bi-list-item-select2.active .bi-textarea {
-  color: #3685f2;
-}
-.bi-list-item-select2:active .bi-high-light,
-.bi-list-item-select2.active .bi-high-light {
   color: #ffffff;
 }
+.bi-list-item-select2.active.bi-border {
+  border-color: #3685f2;
+}
+.bi-list-item-select2.disabled,
 .bi-list-item-select2.disabled:hover,
-.bi-list-item-select2.disabled.hover,
-.bi-list-item-select2.disabled:active,
-.bi-list-item-select2.disabled.active {
+.bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-input,
+.bi-list-item-select2.disabled:hover .bi-input,
+.bi-list-item-select2.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-textarea,
+.bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-list-item-select2.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-select2.disabled .bi-high-light,
+.bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-list-item-select2.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
+.bi-theme-dark .bi-list-item-select2:hover,
+.bi-theme-dark .bi-list-item-select2.hover {
+  color: #ffffff;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-select2.active,
+.bi-theme-dark .bi-list-item-select2:active {
+  color: #3685f2;
+  background-color: #242640;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-input,
+.bi-theme-dark .bi-list-item-select2:active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.active .bi-textarea,
+.bi-theme-dark .bi-list-item-select2:active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-select2.disabled,
+.bi-theme-dark .bi-list-item-select2.disabled:hover,
+.bi-theme-dark .bi-list-item-select2.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
+.bi-list-item-select3:hover,
+.bi-list-item-select3.hover {
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active,
+.bi-list-item-select3.active {
+  color: #3685f2;
+  background-color: #f7f8fa;
+}
+.bi-list-item-select3:active .bi-input,
+.bi-list-item-select3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-select3:active .bi-textarea,
+.bi-list-item-select3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-select3.disabled:hover,
+.bi-list-item-select3.disabled.hover,
+.bi-list-item-select3.disabled:active,
+.bi-list-item-select3.disabled.active {
   background-color: #ffffff !important;
 }
 .bi-theme-dark .bi-list-item-select:hover,

src/css/resource/background.css

@@ -39,41 +39,89 @@
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/half_selected.png');
   _background: none;

src/css/widget/multiselect/multiselect.css

@@ -13,8 +13,7 @@
 .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 .bi-combo-hover > .bi-border {
   border-color: #3685f2;
 }
 
@@ -33,6 +32,9 @@
 .bi-multi-select-insert-combo.combo-show .trigger-down {
   display: none;
 }
+.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
+  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/css/widget/singleselect/singleselect.css

@@ -0,0 +1,18 @@
+.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 .bi-combo-hover > .bi-border {
+  border-color: #3685f2;
+}

src/less/base/combo/combo.less

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

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

@@ -25,11 +25,9 @@
       display: none;
     }
   }
-}
 
-.bi-combo {
-  &.bi-combo-popup, &:hover{
-    & > .bi-search-text-value-trigger {
+  & .bi-combo-hover {
+    & > .bi-border {
       border-color: @color-bi-border-highlight;
     }
   }

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

@@ -0,0 +1,5 @@
+@import "../../index";
+
+.bi-static-combo {
+
+}

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

@@ -1,19 +1,11 @@
 @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 {
-      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 {
+    & > .bi-border {
+      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 {
+    & > .bi-border {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+}

src/less/core/utils/common.less

@@ -42,11 +42,7 @@ textarea {
 }
 
 .bi-focus-shadow {
-  &:focus-within, &:focus {
-    border-color: @color-bi-border-highlight;
-    .box-shadow(0 0 5px 2px, @color-bi-blue-20);
-  }
-  &:hover {
+  &:focus-within, &:focus, &:hover {
     border-color: @color-bi-border-highlight;
   }
 }
@@ -586,104 +582,8 @@ textarea {
   }
 }
 
-//文字和背景hover和active时变化 hover和点击时边框变化，active后背景和边框变化
-.bi-list-item-active2 {
-  &:hover, &.hover {
-    color: @color-bi-text-black;
-    & .bi-input {
-      color: @color-bi-text-black;
-    }
-    & .bi-textarea {
-      color: @color-bi-text-black;
-    }
-    &.bi-border {
-      border-color: @color-bi-border-highlight;
-    }
-  }
-  &:active {
-    color: @color-bi-text-highlight;
-    & .bi-input {
-      color: @color-bi-text-highlight;
-    }
-    & .bi-textarea {
-      color: @color-bi-text-highlight;
-    }
-    &.bi-border {
-      border-color: @color-bi-border-highlight;
-    }
-  }
-  &.active {
-    color: @color-bi-text;
-    & .bi-input {
-      color: @color-bi-text;
-    }
-    & .bi-textarea {
-      color: @color-bi-text;
-    }
-    &.bi-border {
-      border-color: @color-bi-border-highlight;
-    }
-    background-color: @color-bi-background-highlight;
-  }
-  &.disabled {
-    &, &:hover, &:active {
-      background-color: transparent !important;
-      color: @color-bi-text-disabled !important;
-      & .bi-input {
-        color: @color-bi-text-disabled !important;
-      }
-      & .bi-textarea {
-        color: @color-bi-text-disabled !important;
-      }
-      & .bi-high-light {
-        color: @color-bi-text-disabled !important;
-      }
-    }
-  }
-}
-
-.bi-theme-dark {
-  .bi-list-item-active2 {
-    &:hover, &.hover {
-      color: @color-bi-text;
-      & .bi-input {
-        color: @color-bi-text;
-      }
-      & .bi-textarea {
-        color: @color-bi-text;
-      }
-      background-color: @color-bi-background-default-theme-dark;
-    }
-    &.active, &:active {
-      color: @color-bi-text-highlight;
-      & .bi-input {
-        color: @color-bi-text-highlight;
-      }
-      & .bi-textarea {
-        color: @color-bi-text-highlight;
-      }
-      background-color: @color-bi-background-default-theme-dark;
-    }
-    &.disabled {
-      &, &:hover, &:active {
-        background-color: transparent !important;
-        color: @color-bi-text-disabled-theme-dark !important;
-        & .bi-input {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-        & .bi-textarea {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-        & .bi-high-light {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-      }
-    }
-  }
-}
-
 //文字和背景hover和active时变化 hover
-.bi-list-item-active3 {
+.bi-list-item-active2 {
   &:hover, &.hover {
     color: @color-bi-text-black;
     & .bi-input {
@@ -722,7 +622,7 @@ textarea {
 }
 
 .bi-theme-dark {
-  .bi-list-item-active3 {
+  .bi-list-item-active2 {
     &:hover, &.hover {
       color: @color-bi-text;
       & .bi-input {
@@ -880,13 +780,109 @@ textarea {
   }
 }
 
-//与bi-list-item-select的区别是背景是灰的
+//文字和背景hover和active时变化 hover和点击时边框变化，active后背景和边框变化
 .bi-list-item-select2 {
+  &:hover, &.hover {
+    color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
+    & .bi-textarea {
+      color: @color-bi-text-black;
+    }
+    &.bi-border {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+  &:active {
+    color: @color-bi-text-highlight;
+    & .bi-input {
+      color: @color-bi-text-highlight;
+    }
+    & .bi-textarea {
+      color: @color-bi-text-highlight;
+    }
+    &.bi-border {
+      border-color: @color-bi-border-highlight;
+    }
+  }
+  &.active {
+    color: @color-bi-text;
+    & .bi-input {
+      color: @color-bi-text;
+    }
+    & .bi-textarea {
+      color: @color-bi-text;
+    }
+    &.bi-border {
+      border-color: @color-bi-border-highlight;
+    }
+    background-color: @color-bi-background-highlight;
+  }
+  &.disabled {
+    &, &:hover, &:active {
+      background-color: transparent !important;
+      color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
+      & .bi-textarea {
+        color: @color-bi-text-disabled !important;
+      }
+      & .bi-high-light {
+        color: @color-bi-text-disabled !important;
+      }
+    }
+  }
+}
+
+.bi-theme-dark {
+  .bi-list-item-select2 {
+    &:hover, &.hover {
+      color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
+      & .bi-textarea {
+        color: @color-bi-text;
+      }
+      background-color: @color-bi-background-default-theme-dark;
+    }
+    &.active, &:active {
+      color: @color-bi-text-highlight;
+      & .bi-input {
+        color: @color-bi-text-highlight;
+      }
+      & .bi-textarea {
+        color: @color-bi-text-highlight;
+      }
+      background-color: @color-bi-background-default-theme-dark;
+    }
+    &.disabled {
+      &, &:hover, &:active {
+        background-color: transparent !important;
+        color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-textarea {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-high-light {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+      }
+    }
+  }
+}
+
+//与bi-list-item-select的区别是背景是灰的
+.bi-list-item-select3 {
   &:hover, &.hover {
     background-color: @color-bi-background-normal;
   }
   &:active, &.active {
-    color: @color-bi-text;
+    color: @color-bi-text-highlight;
     & .bi-input {
       color: @color-bi-text-highlight;
     }
@@ -894,9 +890,6 @@ textarea {
       color: @color-bi-text-highlight;
     }
     background-color: @color-bi-background-normal;
-    & .bi-high-light {
-      color: @color-bi-text;
-    }
   }
   &.disabled {
     &:hover, &.hover, &:active, &.active {

src/less/resource/background.less

@@ -39,34 +39,66 @@
 }
 
 .ztree li span.button.chk.checkbox_false_full {
-  .imagePath(@icon-checkbox-normal);
+  .image2xPath(@icon-checkbox-normal);
 }
 
 .ztree li span.button.chk.checkbox_false_full_focus {
-  .imagePath(@icon-checkbox-normal);
+  .image2xPath(@icon-checkbox-normal);
 }
 
 .ztree li span.button.chk.checkbox_false_part {
-  .imagePath(@icon-half-select);
+  .image2xPath(@icon-half-select);
 }
 
 .ztree li span.button.chk.checkbox_false_part_focus {
-  .imagePath(@icon-half-select);
+  .image2xPath(@icon-half-select);
 }
 
 .ztree li span.button.chk.checkbox_true_full {
-  .imagePath(@icon-checkbox-active);
+  .image2xPath(@icon-checkbox-active);
 }
 
 .ztree li span.button.chk.checkbox_true_full_focus {
-  .imagePath(@icon-checkbox-active);
+  .image2xPath(@icon-checkbox-active);
 }
 
 .ztree li span.button.chk.checkbox_true_part {
-  .imagePath(@icon-half-select);
+  .image2xPath(@icon-half-select);
 }
 
 .ztree li span.button.chk.checkbox_true_part_focus {
+  .image2xPath(@icon-half-select);
+}
+
+.ztree.hack li span.button.chk.checkbox_false_full {
+  .imagePath(@icon-checkbox-normal);
+}
+
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
+  .imagePath(@icon-checkbox-normal);
+}
+
+.ztree.hack li span.button.chk.checkbox_false_part {
+  .imagePath(@icon-half-select);
+}
+
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
+  .imagePath(@icon-half-select);
+}
+
+.ztree.hack li span.button.chk.checkbox_true_full {
+  .imagePath(@icon-checkbox-active);
+}
+
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
+  .imagePath(@icon-checkbox-active);
+}
+
+.ztree.hack li span.button.chk.checkbox_true_part {
+  .imagePath(@icon-half-select);
+}
+
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   .imagePath(@icon-half-select);
 }
 

src/less/visual.less

@@ -199,7 +199,8 @@
     content: "";
     background-color: #ffffff;
     transform: rotate(-135deg);
-    .box-shadow(1px 1px 1px 0, fade(#232E40, 20));
+    border-bottom: 1px solid #f2f4f7;
+    border-right: 1px solid #f2f4f7;
   }
 }
 
@@ -217,7 +218,8 @@
     content: "";
     background-color: #ffffff;
     transform: rotate(45deg);
-    .box-shadow(1px 1px 1px 0, fade(#232E40, 20));
+    border-bottom: 1px solid #f2f4f7;
+    border-right: 1px solid #f2f4f7;
   }
 
 }
@@ -236,7 +238,8 @@
     content: "";
     background-color: #ffffff;
     transform: rotate(135deg);
-    .box-shadow(1px 1px 1px 0, fade(#232E40, 20));
+    border-bottom: 1px solid #f2f4f7;
+    border-right: 1px solid #f2f4f7;
   }
 }
 
@@ -254,6 +257,7 @@
     content: "";
     background-color: #ffffff;
     transform: rotate(-45deg);
-    .box-shadow(1px 1px 1px 0, fade(#232E40, 20));
+    border-bottom: 1px solid #f2f4f7;
+    border-right: 1px solid #f2f4f7;
   }
 }

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

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

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

@@ -18,4 +18,10 @@
       display: none;
     }
   }
+
+  & .bi-combo-hover {
+    & > .bi-border {
+      border-color: @color-bi-border-highlight;
+    }
+  }
 }

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

@@ -18,14 +18,9 @@
       display: none;
     }
   }
-}
-
-.bi-combo {
-  &.bi-combo-popup {
-    &:focus, &:hover {
-      & > .bi-single-select-trigger {
-        border-color: @color-bi-border-highlight;
-      }
+  & .bi-combo-hover {
+    & > .bi-border {
+      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/numbereditor/number.editor.js

@@ -42,7 +42,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             forceNotSelected: true,
             trigger: "lclick,",
-            cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(o.step);
@@ -53,7 +53,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             type: "bi.icon_button",
             trigger: "lclick,",
             forceNotSelected: true,
-            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12"
+            cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             self._finetuning(-o.step);

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
+            }
         });
     },
 

src/widget/singleslider/button/iconbutton.slider.js

@@ -25,7 +25,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select2",
+                    cls: "slider-button bi-list-item-select3",
                     ref: function () {
                         self.slider = this;
                     }

src/widget/year/combo.year.js

@@ -1,7 +1,7 @@
 BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-combo bi-border",
+        baseCls: "bi-year-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期

src/widget/yearmonth/combo.yearmonth.js

@@ -1,7 +1,7 @@
 BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
 
     props: {
-        baseCls: "bi-year-month-combo  bi-border",
+        baseCls: "bi-year-month-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期

src/widget/yearquarter/combo.yearquarter.js

@@ -1,7 +1,7 @@
 BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-quarter-combo bi-border",
+        baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期

ui/css/background.css

@@ -39,41 +39,89 @@
   _background: none;
 }
 .ztree li span.button.chk.checkbox_false_full {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_full_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_false_part_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_full_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/check_box_active.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree li span.button.chk.checkbox_true_part_focus {
+  background: url('resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/half_selected.png');
+  background-size: contain;
+  _background: none;
+}
+.ztree.hack li span.button.chk.checkbox_false_full {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_full_focus {
+.ztree.hack li span.button.chk.checkbox_false_full_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part {
+.ztree.hack li span.button.chk.checkbox_false_part {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_false_part_focus {
+.ztree.hack li span.button.chk.checkbox_false_part_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full {
+.ztree.hack li span.button.chk.checkbox_true_full {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_full_focus {
+.ztree.hack li span.button.chk.checkbox_true_full_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/check_box_active.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part {
+.ztree.hack li span.button.chk.checkbox_true_part {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;
 }
-.ztree li span.button.chk.checkbox_true_part_focus {
+.ztree.hack li span.button.chk.checkbox_true_part_focus {
   background: url('resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png') no-repeat center center;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/half_selected.png');
   _background: none;