From 2237feda612e4e8bebf63b20e6bc75e29cb9b84f Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 19 Feb 2021 11:29:51 +0800
Subject: [PATCH] color chooser

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

diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js
index aad99a4bb..850333b3c 100644
--- a/src/case/colorchooser/colorchooser.js
+++ b/src/case/colorchooser/colorchooser.js
@@ -9,17 +9,22 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
 
     _defaultConfig: function () {
         return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-color-chooser",
+            baseCls: "bi-color-chooser bi-border bi-focus-shadow",
             value: "",
             height: 24,
-            el: {}
+            el: {},
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
     _init: function () {
         BI.ColorChooser.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         o.value = o.value || "";
         this.combo = BI.createWidget({
             type: "bi.combo",
@@ -33,8 +38,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
                 ref: function (_ref) {
                     self.trigger = _ref;
                 },
-                width: o.el.type ? o.width : o.width - 2,
-                height: o.el.type ? o.height : o.height - 2
+                width: o.width,
+                height: o.height
             }, o.el),
             popup: {
                 el: BI.extend({
diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js
index ab1ad1862..3314026de 100644
--- a/src/case/colorchooser/colorchooser.trigger.js
+++ b/src/case/colorchooser/colorchooser.trigger.js
@@ -10,7 +10,7 @@ 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 bi-border",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
             height: 22
         });
     },
diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js
index 74421ce73..e22df7882 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 bi-border",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
             height: 22
         });
     },
diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
index 6dfdb8ed5..3a2eea2de 100644
--- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
+++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
@@ -16,7 +16,9 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     _init: function () {
         BI.TextValueDownListCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         this._createValueMap();
 
         var value;