From 6eef021942c1f82b793f20dc50ce1d0471d82574 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 8 Jun 2022 19:43:03 +0800
Subject: [PATCH] =?UTF-8?q?BI-106879=20=E5=8D=95=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E5=8E=BB=E5=9C=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/colorchooser/colorchooser.trigger.js             | 2 +-
 src/case/colorchooser/colorchooser.trigger.long.js        | 2 +-
 src/case/combo/icontextvaluecombo/combo.icontextvalue.js  | 2 +-
 .../combo/searchtextvaluecombo/combo.searchtextvalue.js   | 2 +-
 src/case/combo/textvaluecombo/combo.textvalue.js          | 2 +-
 src/less/base/colorchooser/colorchooser.trigger.less      | 4 ----
 src/less/base/editor/editor.search.less                   | 1 -
 src/less/core/utils/common.less                           | 8 ++++++++
 src/less/widget/numbereditor/number.editor.less           | 1 -
 src/less/widget/numberinterval/numberinterval.less        | 8 --------
 src/less/widget/year/trigger.year.less                    | 2 +-
 src/widget/dynamicdate/dynamicdate.combo.js               | 2 +-
 src/widget/dynamicdatetime/dynamicdatetime.combo.js       | 2 +-
 src/widget/editor/editor.search.js                        | 2 +-
 .../multilayerselecttree/multilayerselecttree.combo.js    | 2 +-
 .../multilayersingletree/multilayersingletree.combo.js    | 2 +-
 src/widget/multiselect/multiselect.combo.js               | 2 +-
 src/widget/multiselect/multiselect.combo.nobar.js         | 2 +-
 src/widget/multiselect/multiselect.insert.combo.js        | 2 +-
 src/widget/multiselect/multiselect.insert.combo.nobar.js  | 2 +-
 src/widget/multitree/multi.tree.combo.js                  | 2 +-
 src/widget/multitree/multi.tree.insert.combo.js           | 2 +-
 src/widget/multitree/multi.tree.list.combo.js             | 2 +-
 src/widget/numbereditor/number.editor.js                  | 2 +-
 src/widget/numberinterval/numberinterval.js               | 8 ++++----
 src/widget/singleselect/singleselect.combo.js             | 2 +-
 src/widget/singleselect/singleselect.insert.combo.js      | 2 +-
 src/widget/singletree/singletree.combo.js                 | 2 +-
 src/widget/timeinterval/timeinterval.js                   | 1 +
 src/widget/year/combo.year.js                             | 2 +-
 src/widget/yearmonth/combo.yearmonth.js                   | 2 +-
 src/widget/yearquarter/combo.yearquarter.js               | 2 +-
 32 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js
index 9f8e370e7..af2039226 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 (config) {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 22
         });
     },
diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js
index e6c518c08..773b3d326 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 (config) {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24
         });
     },
diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
index 92732d9b1..a4d324da1 100644
--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@@ -5,7 +5,7 @@
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-icon-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-icon-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24,
             iconHeight: null,
             iconWidth: null,
diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
index 111d20432..8de574c76 100644
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@@ -28,7 +28,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
 
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
             container: o.container,
             adjustLength: 2,
             height: height,
diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js
index 7c8d90f62..ebd325661 100644
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@@ -7,7 +7,7 @@
 BI.TextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         return BI.extend(BI.TextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
             text: "",
diff --git a/src/less/base/colorchooser/colorchooser.trigger.less b/src/less/base/colorchooser/colorchooser.trigger.less
index a647bb9f2..721231f3c 100644
--- a/src/less/base/colorchooser/colorchooser.trigger.less
+++ b/src/less/base/colorchooser/colorchooser.trigger.less
@@ -1,9 +1,5 @@
 @import "../../index.less";
 
-.bi-color-chooser-trigger {
-  .border-radius(2px);
-}
-
 .bi-combo-popup {
   &>.bi-color-chooser-trigger {
     border-color: @color-bi-border-hover-combo;
diff --git a/src/less/base/editor/editor.search.less b/src/less/base/editor/editor.search.less
index cf29965b0..0793d33be 100644
--- a/src/less/base/editor/editor.search.less
+++ b/src/less/base/editor/editor.search.less
@@ -1,7 +1,6 @@
 @import "../../index.less";
 /*************BI.SearchEditor******************/
 .bi-search-editor {
-  .border-radius(2px);
   & .circle-close-font{
     font-size: @font-size-18;
   }
diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less
index fd9b61c4a..e0396d286 100644
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@@ -339,6 +339,14 @@
   .border-radius(2px);
 }
 
+.bi-border-corner-left-radius {
+  .border-corner-left-radius(2px, 2px);
+}
+
+.bi-border-corner-right-radius {
+  .border-corner-right-radius(2px, 2px);
+}
+
 .bi-font-bold {
   font-weight: 700;
 }
diff --git a/src/less/widget/numbereditor/number.editor.less b/src/less/widget/numbereditor/number.editor.less
index ba8ab84ac..f91442d49 100644
--- a/src/less/widget/numbereditor/number.editor.less
+++ b/src/less/widget/numbereditor/number.editor.less
@@ -1,7 +1,6 @@
 @import "../../index.less";
 
 .bi-number-editor {
-  .border-radius(2px);
   & .pull-down-font {
     font-size: @font-size-12;
   }
diff --git a/src/less/widget/numberinterval/numberinterval.less b/src/less/widget/numberinterval/numberinterval.less
index 67b5a835a..72566b2a9 100644
--- a/src/less/widget/numberinterval/numberinterval.less
+++ b/src/less/widget/numberinterval/numberinterval.less
@@ -4,14 +4,7 @@
   &.hack {
     .border-radius(0px);
   }
-  & .number-interval-small-editor {
-    .border-corner-left-radius(2px, 2px);
-  }
-  & .number-interval-big-editor {
-    .border-corner-right-radius(2px, 2px);
-  }
   & .number-interval-big-combo {
-    .border-corner-left-radius(2px, 2px);
     & .bi-icon-combo-trigger {
       & .icon-combo-trigger-icon {
         font-size: @font-size-14;
@@ -20,7 +13,6 @@
   }
 
   & .number-interval-small-combo {
-    .border-corner-right-radius(2px, 2px);
     & .bi-icon-combo-trigger {
       & .icon-combo-trigger-icon {
         font-size: @font-size-14;
diff --git a/src/less/widget/year/trigger.year.less b/src/less/widget/year/trigger.year.less
index ed8d0d442..800955966 100644
--- a/src/less/widget/year/trigger.year.less
+++ b/src/less/widget/year/trigger.year.less
@@ -1,4 +1,4 @@
 @import "../../index.less";
 .bi-year-trigger{
-  .border-radius(2px);
+
 }
\ No newline at end of file
diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js
index 185e1ca35..75c3739af 100644
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@@ -38,7 +38,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
             items: [{
                 el: {
                     type: "bi.combo",
-                    cls: (opts.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (opts.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     container: opts.container,
                     ref: function () {
                         self.combo = this;
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 1b8a58243..41df2ac41 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@@ -38,7 +38,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
             items: [{
                 el: {
                     type: "bi.combo",
-                    cls: (opts.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (opts.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     destroyWhenHide: true,
                     container: opts.container,
                     ref: function () {
diff --git a/src/widget/editor/editor.search.js b/src/widget/editor/editor.search.js
index 8f27127e9..b1747849a 100644
--- a/src/widget/editor/editor.search.js
+++ b/src/widget/editor/editor.search.js
@@ -5,7 +5,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: "bi-search-editor bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-search-editor bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24,
             errorText: "",
             watermark: BI.i18nText("BI-Basic_Search"),
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
index 8230ace71..48ff0cbe0 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
@@ -38,7 +38,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius " + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
+            cls: (o.simple ? "bi-border-bottom " : "bi-border bi-border-radius ") + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,
diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js
index 066105da7..63f43b4f9 100644
--- a/src/widget/multilayersingletree/multilayersingletree.combo.js
+++ b/src/widget/multilayersingletree/multilayersingletree.combo.js
@@ -45,7 +45,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius " + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius ") + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,
diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js
index 254aa0340..23d5385b8 100644
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@@ -124,7 +124,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js
index 06138cf4b..ff4cc5d34 100644
--- a/src/widget/multiselect/multiselect.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.combo.nobar.js
@@ -122,7 +122,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: false,
             container: o.container,
             el: this.trigger,
diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js
index b5906f856..b1b4a202e 100644
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@@ -125,7 +125,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             el: this.trigger,
             adjustLength: 1,
diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js
index de4f9eb35..1b92a9622 100644
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@@ -117,7 +117,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: false,
             container: o.container,
             el: this.trigger,
diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js
index 40fc91a14..4e42df154 100644
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@@ -49,7 +49,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js
index 76f9c0b5c..9694b3556 100644
--- a/src/widget/multitree/multi.tree.insert.combo.js
+++ b/src/widget/multitree/multi.tree.insert.combo.js
@@ -65,7 +65,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js
index 198eb53fc..ff5a2864a 100644
--- a/src/widget/multitree/multi.tree.list.combo.js
+++ b/src/widget/multitree/multi.tree.list.combo.js
@@ -80,7 +80,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js
index c62497afe..596105947 100644
--- a/src/widget/numbereditor/number.editor.js
+++ b/src/widget/numbereditor/number.editor.js
@@ -5,7 +5,7 @@
 BI.NumberEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function (conf) {
         return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-number-editor bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-number-editor bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             validationChecker: BI.emptyFn,
             valueFormatter: function (v) {
                 return v;
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index 93d2c33b7..88b640130 100644
--- a/src/widget/numberinterval/numberinterval.js
+++ b/src/widget/numberinterval/numberinterval.js
@@ -55,7 +55,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
                 }
                 return true;
             },
-            cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border")
+            cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
         });
 
         this.smallTip = BI.createWidget({
@@ -93,7 +93,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
                 }
                 return true;
             },
-            cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border")
+            cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
         });
 
         this.bigTip = BI.createWidget({
@@ -113,7 +113,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         });
         this.smallCombo = BI.createWidget({
             type: "bi.icon_combo",
-            cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right"),
+            cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"),
             height: o.height - (o.simple ? 0 : 2),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
@@ -132,7 +132,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         }
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
-            cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left"),
+            cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"),
             height: o.height - (o.simple ? 0 : 2),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js
index fae620c93..fac81d8d7 100644
--- a/src/widget/singleselect/singleselect.combo.js
+++ b/src/widget/singleselect/singleselect.combo.js
@@ -83,7 +83,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             container: o.container,
             toggle: false,
             el: this.trigger,
diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js
index 46754e1dc..faa3511be 100644
--- a/src/widget/singleselect/singleselect.insert.combo.js
+++ b/src/widget/singleselect/singleselect.insert.combo.js
@@ -94,7 +94,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             container: o.container,
             toggle: false,
             el: this.trigger,
diff --git a/src/widget/singletree/singletree.combo.js b/src/widget/singletree/singletree.combo.js
index 32d39d338..ad6b85268 100644
--- a/src/widget/singletree/singletree.combo.js
+++ b/src/widget/singletree/singletree.combo.js
@@ -6,7 +6,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
 
     _defaultConfig: function (config) {
         return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-tree-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-single-tree-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             trigger: {},
             height: 24,
             text: "",
diff --git a/src/widget/timeinterval/timeinterval.js b/src/widget/timeinterval/timeinterval.js
index 56a9df8fb..95fd88bfe 100644
--- a/src/widget/timeinterval/timeinterval.js
+++ b/src/widget/timeinterval/timeinterval.js
@@ -69,6 +69,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         var combo = BI.createWidget({
             type: "bi.dynamic_date_time_combo",
+            simple: o.simple,
             supportDynamic: o.supportDynamic,
             minDate: o.minDate,
             maxDate: o.maxDate,
diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js
index 1774ca384..cf6485d13 100644
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@@ -133,7 +133,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.htape",
-                    cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },
diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js
index 4bc1285e9..45431225b 100644
--- a/src/widget/yearmonth/combo.yearmonth.js
+++ b/src/widget/yearmonth/combo.yearmonth.js
@@ -132,7 +132,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             items: [{
                 el: {
                     type: "bi.htape",
-                    cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },
diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js
index ae42bec41..16537990c 100644
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@@ -135,7 +135,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.htape",
-                    cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },