From ab7f92261b6e69f0013cdaff7ab09f05a7e3db88 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 4 Mar 2021 16:51:01 +0800
Subject: [PATCH] =?UTF-8?q?BI-82207=20fix:=20=E5=9B=9E=E6=BB=9Acolor-choos?=
 =?UTF-8?q?er=E5=8A=A0=E5=9C=A8combo=E4=B8=8A=E7=9A=84border?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/colorchooser/colorchooser.js              | 8 +++-----
 src/case/colorchooser/colorchooser.trigger.js      | 4 ++--
 src/case/colorchooser/colorchooser.trigger.long.js | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js
index bed892c7d..c321baf70 100644
--- a/src/case/colorchooser/colorchooser.js
+++ b/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,
-                height: o.height
+                width: o.width - 2,
+                height: o.height - 2
             }, o.el),
             popup: {
                 el: BI.extend({
diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js
index 17dd665da..8efe4fb79 100644
--- a/src/case/colorchooser/colorchooser.trigger.js
+++ b/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",
-            height: 24
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
+            height: 22
         });
     },
 
diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js
index 238c13f2c..eb15f7551 100644
--- a/src/case/colorchooser/colorchooser.trigger.long.js
+++ b/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
         });
     },