From a9369c3dcc94853aafec1d4fc4eee6904b31d162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=91=9E?= <412285675@qq.com>
Date: Thu, 30 Aug 2018 14:22:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/combo/bubblecombo/popup.bubble.js                  | 6 +++---
 .../combo/searchtextvaluecombo/combo.searchtextvalue.js     | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js
index f6876cae37..388a9d9849 100644
--- a/src/case/combo/bubblecombo/popup.bubble.js
+++ b/src/case/combo/bubblecombo/popup.bubble.js
@@ -124,7 +124,7 @@ BI.shortcut("bi.bubble_bar_popup_view", BI.BubblePopupBarView);
  * @extends BI.BubblePopupView
  */
 BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
-    
+
     props: {
         baseCls: "bi-text-bubble-bar-popup-view",
         text: "",
@@ -156,7 +156,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
             buttons: [{
                 type: "bi.button",
                 value: BI.i18nText("BI-Basic_Cancel"),
-                ghost: true,
+                level: "ignore",
                 height: 24,
                 handler: function () {
                     self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);
@@ -185,4 +185,4 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
     }
 });
 BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
\ No newline at end of file
+BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
index 6f69997baa..95deeb26c1 100644
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@@ -9,6 +9,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
+        extraCls: "",
         warningTitle: "",
         attributes: {
             tabIndex: 0
@@ -30,7 +31,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     },
                     el: {
                         type: "bi.search_text_value_trigger",
-                        cls: "search-text-value-trigger",
+                        cls: "search-text-value-trigger " + this.options.extraCls,
                         ref: function () {
                             self.trigger = this;
                         },
@@ -153,4 +154,4 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
 });
 BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE";
 BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
-BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);
\ No newline at end of file
+BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);

From 9b650ef9b72980e5ef5da6778f922bfc61734c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=91=9E?= <412285675@qq.com>
Date: Thu, 30 Aug 2018 16:29:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js | 3 +--
 src/less/base/combo/combo.searchtextvalue.less               | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
index 95deeb26c1..0d497d5316 100644
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@@ -9,7 +9,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
         text: "",
         items: [],
         tipType: "",
-        extraCls: "",
         warningTitle: "",
         attributes: {
             tabIndex: 0
@@ -31,7 +30,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     },
                     el: {
                         type: "bi.search_text_value_trigger",
-                        cls: "search-text-value-trigger " + this.options.extraCls,
+                        cls: "search-text-value-trigger",
                         ref: function () {
                             self.trigger = this;
                         },
diff --git a/src/less/base/combo/combo.searchtextvalue.less b/src/less/base/combo/combo.searchtextvalue.less
index b8f408068f..fecca71ffa 100644
--- a/src/less/base/combo/combo.searchtextvalue.less
+++ b/src/less/base/combo/combo.searchtextvalue.less
@@ -4,6 +4,9 @@
   & .trigger-icon-button{
     font-size: 16px;
   }
+  & .search-text-value-trigger{
+    .border-radius(2px);
+  }
   &.combo-error {
     & .bi-search-text-value-trigger{
       & .bi-text-button {
@@ -17,4 +20,4 @@
       .rotate(180deg);
     }
   }
-}
\ No newline at end of file
+}