diff --git a/bi.lessconfig.json b/bi.lessconfig.json
index fafccaff8..d1a58f5ce 100644
--- a/bi.lessconfig.json
+++ b/bi.lessconfig.json
@@ -12,10 +12,13 @@
   "@border-color-dark-line": "#2E3A4D",
   "@color-sliver-theme-dark": "#363E55",
   "@border-color-disabled": "rgba(9, 30, 64, 0.07)",
+  "@font-color-normal": "#091E40",
   "@font-color-gray": "rgba(9, 30, 64, 0.9)",
   "@font-color-light-gray": "rgba(9, 30, 64, 0.66)",
   "@font-color-tips": "rgba(9, 30, 64, 0.47)",
   "@font-color-disabled": "rgba(9, 30, 64, 0.25)",
+  "@background-color-normal": "#EEF1F6",
+
   "@color-bi-background-active-radio": "transparent",
   "@color-bi-border-radio": "rgba(9, 30, 64, 0.37)",
   "@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",
@@ -35,6 +38,5 @@
   "@color-bi-color-toast-warning": "#FAAA39",
   "@color-bi-color-toast-error": "#E65251",
   "@color-bi-color-toast-normal": "#2C60DB",
-  "@color-bi-color-toast-text": "#000A19",
-  "@color-bi-color-toast-shadow": "rgba(9, 30, 64, 0.16)"
+  "@color-bi-color-toast-text": "#000A19"
 }
diff --git a/package.json b/package.json
index 14f7108ae..26d1c92a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20220615141348",
+  "version": "2.0.20220616223849",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",
diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js
index 7243d528f..55ff83884 100644
--- a/src/case/trigger/trigger.editor.js
+++ b/src/case/trigger/trigger.editor.js
@@ -6,10 +6,10 @@
  * @extends BI.Trigger
  */
 BI.EditorTrigger = BI.inherit(BI.Trigger, {
-    _defaultConfig: function () {
+    _defaultConfig: function (config) {
         var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border bi-border-radius",
+            baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
             height: 24,
             validationChecker: BI.emptyFn,
             quitChecker: BI.emptyFn,
diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less
index b0e6ce76a..e176eecb4 100644
--- a/src/less/base/tree/tree.expander.less
+++ b/src/less/base/tree/tree.expander.less
@@ -3,40 +3,34 @@
 
 .bi-tree-expander-popup.line {
 
-  &:before {
+  &:after {
     border-left: 1px dashed @border-color-dark-gray-line;
     position: absolute;
     content: "";
     height: 100%;
     left: -1px;
+    top: 0;
   }
 
-  &.solid:before {
+  &.solid:after {
     border-left: 1px solid @border-color-dark-gray-line;
-    position: absolute;
-    content: "";
-    height: 100%;
-    left: -1px;
   }
 }
 
 .bi-theme-dark {
   .bi-tree-expander-popup.line {
 
-    &:before {
+    &:after {
       border-left: 1px dashed @border-color-dark-gray-line-theme-dark;
       position: absolute;
       content: "";
       height: 100%;
       left: -1px;
+      top: 0;
     }
 
-    &.solid:before {
+    &.solid:after {
       border-left: 1px solid @border-color-dark-gray-line-theme-dark;
-      position: absolute;
-      content: "";
-      height: 100%;
-      left: -1px;
     }
   }
 }
diff --git a/src/less/theme/dark.less b/src/less/theme/dark.less
index a0149a1f9..1ba39a88e 100644
--- a/src/less/theme/dark.less
+++ b/src/less/theme/dark.less
@@ -2,7 +2,14 @@
 
 .bi-theme-dark {
   color: @color-bi-text-theme-dark;
+
   & .bi-input {
     color: @color-bi-text;
   }
-}
\ No newline at end of file
+
+  & .bi-textarea {
+    color: @color-bi-text;
+  }
+
+
+}
diff --git a/src/widget/datetime/datetime.combo.js b/src/widget/datetime/datetime.combo.js
index d436da1a8..28037bb69 100644
--- a/src/widget/datetime/datetime.combo.js
+++ b/src/widget/datetime/datetime.combo.js
@@ -9,9 +9,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
         border: 1,
         iconWidth: 24
     },
-    _defaultConfig: function () {
+    _defaultConfig: function (conf) {
         return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-date-time-combo bi-border bi-border-radius",
+            baseCls: "bi-date-time-combo bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             width: 200,
             height: 24,
             minDate: "1900-01-01",
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index 88b640130..9fb76367f 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 bi-border-corner-left-radius")
+            cls: "number-interval-small-editor bi-focus-shadow " + (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 bi-border-corner-right-radius")
+            cls: "number-interval-big-editor bi-focus-shadow" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
         });
 
         this.bigTip = BI.createWidget({