Merge pull request #661 in VISUAL/fineui from ~NJZY/fineui2.0:master to master

* commit '9b650ef9b72980e5ef5da6778f922bfc61734c5a':
  无JIRA任务 样式调整
  无JIRA任务 视觉调整

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);
+BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -153,4 +153,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);
+BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo);

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);
     }
   }
-}
+}