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

* commit '35a349e1af8757483ec60e84ff0d145c864b56f8':
  refactor: 还原
  merge: build一下
  BI-41691 refactor: 视觉加一组深色边框线

dist/2.0/fineui.css

@@ -3537,6 +3537,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
   position: absolute;
@@ -3555,6 +3556,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   transform: rotate(45deg) scale(1) translate(-50%, -50%);
   content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
   border-color: #ffffff;
@@ -3569,6 +3574,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
   opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
@@ -3597,10 +3605,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
   content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
   width: 6px;
@@ -3628,6 +3641,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
   background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
   text-overflow: ellipsis;
   overflow-x: hidden;

dist/2.0/fineui.ie.js

@@ -44735,7 +44735,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -44761,9 +44761,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -45753,7 +45753,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -45782,9 +45782,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -49798,7 +49798,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/2.0/fineui.js

@@ -45139,7 +45139,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -45165,9 +45165,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -46157,7 +46157,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -46186,9 +46186,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -50202,7 +50202,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/base.css

@@ -1381,6 +1381,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
   position: absolute;
@@ -1399,6 +1400,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   transform: rotate(45deg) scale(1) translate(-50%, -50%);
   content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
   border-color: #ffffff;
@@ -1413,6 +1418,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
   opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
@@ -1441,10 +1449,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
   content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
   width: 6px;
@@ -1472,6 +1485,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
   background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
   text-overflow: ellipsis;
   overflow-x: hidden;

dist/base.js

@@ -9350,7 +9350,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -9376,9 +9376,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -10368,7 +10368,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -10397,9 +10397,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });

dist/bundle.css

@@ -3537,6 +3537,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
   position: absolute;
@@ -3555,6 +3556,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   transform: rotate(45deg) scale(1) translate(-50%, -50%);
   content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
   border-color: #ffffff;
@@ -3569,6 +3574,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
   opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
@@ -3597,10 +3605,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
   content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
   width: 6px;
@@ -3628,6 +3641,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
   background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
   text-overflow: ellipsis;
   overflow-x: hidden;

dist/bundle.ie.js

@@ -44735,7 +44735,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -44761,9 +44761,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -45753,7 +45753,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -45782,9 +45782,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -49798,7 +49798,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/bundle.js

@@ -45139,7 +45139,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -45165,9 +45165,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -46157,7 +46157,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -46186,9 +46186,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -50202,7 +50202,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/case.js

@@ -149,7 +149,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/fineui.css

@@ -3537,6 +3537,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
   position: absolute;
@@ -3555,6 +3556,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   transform: rotate(45deg) scale(1) translate(-50%, -50%);
   content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
   border-color: #ffffff;
@@ -3569,6 +3574,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
   opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
@@ -3597,10 +3605,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
   content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
   width: 6px;
@@ -3628,6 +3641,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
   background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
   text-overflow: ellipsis;
   overflow-x: hidden;

dist/fineui.ie.js

@@ -44980,7 +44980,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -45006,9 +45006,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -45998,7 +45998,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -46027,9 +46027,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -50043,7 +50043,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/fineui.js

@@ -45384,7 +45384,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -45410,9 +45410,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -46402,7 +46402,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -46431,9 +46431,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -50447,7 +50447,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

dist/fineui_without_jquery_polyfill.js

@@ -32915,7 +32915,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -32941,9 +32941,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -33312,7 +33312,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -33341,9 +33341,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });
@@ -35016,7 +35016,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

src/base/single/input/checkbox/checkbox.js

@@ -24,7 +24,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                 ref: function (_ref) {
                     self.checkbox = _ref;
                 },
-                cls: "checkbox-context bi-border",
+                cls: "checkbox-context",
                 width: o.iconWidth - 2,
                 height: o.iconHeight - 2
             }]
@@ -50,9 +50,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Checkbox.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.checkbox.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
         } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
         }
     }
 });

src/base/single/input/radio/radio.js

@@ -22,7 +22,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
             element: this.element,
             items: [{
                 type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                 ref: function (_ref) {
                     self.radio = _ref;
                 },
@@ -51,9 +51,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
     setSelected: function (b) {
         BI.Radio.superclass.setSelected.apply(this, arguments);
         if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
         } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
         }
     }
 });

src/case/button/icon/iconhalf/icon.half.js

@@ -7,7 +7,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
     _defaultConfig: function () {
         var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
             height: 14,
             width: 14,
             selected: false

src/css/base/single/input/checkbox.css

@@ -2,6 +2,7 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
   position: absolute;
@@ -20,6 +21,10 @@
   transform: rotate(45deg) scale(1) translate(-50%, -50%);
   content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
   border-color: #ffffff;
@@ -34,3 +39,6 @@
 .bi-checkbox.disabled.active .checkbox-context:after {
   opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}

src/css/base/single/input/radio.css

@@ -2,10 +2,15 @@
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
   content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
   width: 6px;
@@ -33,3 +38,6 @@
 .bi-radio.disabled.active .radio-content:after {
   background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}

src/less/base/single/input/checkbox.less

@@ -3,6 +3,7 @@
 .bi-checkbox {
   & .checkbox-context {
     .border-radius(2px);
+    border: 1px solid @color-bi-border-dark-line;
     &:after {
       position: absolute;
       display: table;
@@ -18,9 +19,12 @@
     }
   }
   &.active, &:active {
-    & .checkbox-context:after {
+    & .checkbox-context{
-      border-color: @color-bi-border-default;
+      border-color: @color-bi-border-highlight;
-      opacity: 1;
+      &:after {
+        border-color: @color-bi-border-default;
+        opacity: 1;
+      }
     }
   }
   &.disabled {
@@ -37,3 +41,11 @@
     }
   }
 }
+
+.bi-theme-dark {
+  .bi-checkbox {
+    & .checkbox-context {
+      border-color: @color-bi-border-dark-line-theme-dark;
+    }
+  }
+}

src/less/base/single/input/radio.less

@@ -3,21 +3,25 @@
 .bi-radio {
   & .radio-content {
     .border-radius(8px);
+    border: 1px solid @color-bi-border-dark-line;
     &:after {
       content: "";
     }
   }
   &:active, &.active {
-    & .radio-content:after {
+    & .radio-content {
-      width: 6px;
+      border-color:  @color-bi-border-highlight;
-      height: 6px;
+      &:after {
-      display: table;
+        width: 6px;
-      position: absolute;
+        height: 6px;
-      top: 50%;
+        display: table;
-      left: 50%;
+        position: absolute;
-      .border-radius(3px);
+        top: 50%;
-      background-color: @color-bi-background-default;
+        left: 50%;
-      .transform(translate(-50%, -50%));
+        .border-radius(3px);
+        background-color: @color-bi-background-default;
+        .transform(translate(-50%, -50%));
+      }
     }
   }
   &.disabled {
@@ -34,3 +38,11 @@
     }
   }
 }
+
+.bi-theme-dark {
+  .bi-radio {
+    & .radio-content {
+      border-color: @color-bi-border-dark-line-theme-dark;
+    }
+  }
+}

src/less/lib/colors.less

@@ -89,6 +89,10 @@
 @color-bi-border-line: @border-color-line;
 //深色系边框线色
 @color-bi-border-line-theme-dark: @border-color-line-theme-dark;
+//深色边框线
+@color-bi-border-dark-line: @border-color-dark-line;
+//深色系深色边框线
+@color-bi-border-dark-line-theme-dark: @border-color-dark-line-theme-dark;
 //灰化边框
 @color-bi-border-disabled: @border-color-disabled;
 //成功边框色

src/less/lib/constant.less

@@ -85,6 +85,8 @@
 @border-color-line-theme-dark: #3a3c53;
 @border-color-light-line: #f2f4f7;
 @border-color-light-line-theme-dark: #2F3149;
+@border-color-dark-line: #9EA6B2;
+@border-color-dark-line-theme-dark: #9EA6B2;
 @border-color-highlight: #3685f2;
 
 @border-color-warning: #fbb03b;