Pull request #1803: BI-82207 fix: 回滚color-chooser加在combo上的border

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'ab7f92261b6e69f0013cdaff7ab09f05a7e3db88':
  BI-82207 fix: 回滚color-chooser加在combo上的border

src/case/colorchooser/colorchooser.js

@@ -9,7 +9,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
 
     _defaultConfig: function () {
         return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-color-chooser bi-border",
+            baseCls: "bi-color-chooser",
             value: "",
             height: 24,
             el: {},
@@ -18,8 +18,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
-        BI.isNumeric(o.width) && (o.width -= 2);
         BI.ColorChooser.superclass._init.apply(this, arguments);
         o.value = o.value || "";
         this.combo = BI.createWidget({
@@ -34,8 +32,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
                 ref: function (_ref) {
                     self.trigger = _ref;
                 },
-                width: o.width,
+                width: o.width - 2,
-                height: o.height
+                height: o.height - 2
             }, o.el),
             popup: {
                 el: BI.extend({

src/case/colorchooser/colorchooser.trigger.js

@@ -10,8 +10,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
-            height: 24
+            height: 22
         });
     },
 

src/case/colorchooser/colorchooser.trigger.long.js

@@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
             height: 24
         });
     },