diff --git a/bi/base.js b/bi/base.js
index 1ac498a6c..7d9636626 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -17837,6 +17837,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         })
     },
 
+    focus: function () {
+        this.editor.focus();
+    },
+
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
diff --git a/bi/widget.js b/bi/widget.js
index c80a93cea..65d1aa25a 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -4860,7 +4860,7 @@ BI.shortcut('bi.date_triangle_trigger', BI.DateTriangleTrigger);/**
 BI.DateCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.DateCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-date-combo",
+            baseCls: "bi-date-combo bi-border",
             height: 30
         });
     },
@@ -4919,7 +4919,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
 
     _defaultConfig: function () {
         return BI.extend(BI.DateTrigger.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "bi-date-trigger bi-border",
+            extraCls: "bi-date-trigger",
             min: '1900-01-01', //最小日期
             max: '2099-12-31', //最大日期
             height: 25
diff --git a/docs/base.js b/docs/base.js
index 1ac498a6c..7d9636626 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -17837,6 +17837,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         })
     },
 
+    focus: function () {
+        this.editor.focus();
+    },
+
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
diff --git a/docs/widget.js b/docs/widget.js
index c80a93cea..65d1aa25a 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -4860,7 +4860,7 @@ BI.shortcut('bi.date_triangle_trigger', BI.DateTriangleTrigger);/**
 BI.DateCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.DateCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-date-combo",
+            baseCls: "bi-date-combo bi-border",
             height: 30
         });
     },
@@ -4919,7 +4919,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
 
     _defaultConfig: function () {
         return BI.extend(BI.DateTrigger.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "bi-date-trigger bi-border",
+            extraCls: "bi-date-trigger",
             min: '1900-01-01', //最小日期
             max: '2099-12-31', //最大日期
             height: 25