diff --git a/src/less/base/combo/combo.bubble.less b/src/less/base/combo/combo.bubble.less
index b8ca94ed1..337077402 100644
--- a/src/less/base/combo/combo.bubble.less
+++ b/src/less/base/combo/combo.bubble.less
@@ -7,7 +7,7 @@
     line-height: 0;
     .z-index-layer(@zIndex-popup);
     //  ie10一下无背景色会鼠标穿透
-    .background-color(@background-color-default, 0);
+    .background-color(@color-bi-background-default, 0);
   }
   & .bubble-combo-triangle-left {
     z-index: 1;
diff --git a/src/less/base/combo/combo.less b/src/less/base/combo/combo.less
index ab380ec4a..a4203f7ec 100644
--- a/src/less/base/combo/combo.less
+++ b/src/less/base/combo/combo.less
@@ -29,7 +29,7 @@
   &.disabled {
     &.bi-combo-hover, &:hover {
       &.bi-border {
-        border-color: @border-color-line;
+        border-color: @color-bi-border-line;
       }
     }
   }
@@ -40,7 +40,7 @@
     &.disabled {
       &.bi-combo-hover, &:hover {
         &.bi-border {
-          border-color: @border-color-line-theme-dark;
+          border-color: @color-bi-border-line-theme-dark;
         }
       }
     }
diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less
index e4355b37e..85a928cd4 100644
--- a/src/less/base/tree/tree.expander.less
+++ b/src/less/base/tree/tree.expander.less
@@ -2,7 +2,7 @@
 .bi-tree-expander-popup.line:before {
   position: absolute;
   content: "";
-  border-left: 1px dashed #D0D4DA;
+  border-left: 1px dashed @color-bi-border-dark-gray-line;
   height: 100%;
   left: 11px;
 }
diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less
index 28a3aaf7c..54653d2e9 100644
--- a/src/less/lib/colors.less
+++ b/src/less/lib/colors.less
@@ -1,6 +1,6 @@
 @import "constant";
 
-// 色彩库,从constant.less中获取相关颜色,不要出现#xxxxxx
+// 色彩库,业务相关。从constant.less中获取相关颜色,不要出现#xxxxxx
 
 //默认字体颜色
 @color-bi-text-normal: @font-color-normal;
@@ -104,6 +104,10 @@
 @color-bi-border-line: @border-color-line;
 //深色主题边框线色
 @color-bi-border-line-theme-dark: @border-color-line-theme-dark;
+//深灰色边框线
+@color-bi-border-dark-gray-line: @border-color-dark-gray-line;
+//深灰色主题深色边框线
+@color-bi-border-dark-gray-line-theme-dark: @border-color-dark-gray-line-theme-dark;
 //深色边框线
 @color-bi-border-dark-line: @border-color-dark-line;
 //深色主题深色边框线
@@ -132,6 +136,8 @@
 //mask颜色
 @color-bi-button-mask: @color-bi-background-black;
 
+@water-mark-color-theme-dark: @background-color-light-disabled-theme-dark;
+
 //颜色百分比
 //green
 @color-bi-green-80: fade(@font-color-success, 80);
diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less
index eed7d0336..beb7d04a6 100644
--- a/src/less/lib/constant.less
+++ b/src/less/lib/constant.less
@@ -1,8 +1,5 @@
-//常量库
-
-//classified
-
-//
+// 基础配色方案，业务无关
+//font size
 @font-size-12: 12px;
 @font-size-13: 13px;
 @font-size-14: 14px;
@@ -92,6 +89,8 @@
 @border-color-line-theme-dark: #363e55;
 @border-color-light-line: #f2f4f7;
 @border-color-light-line-theme-dark: #292f45;
+@border-color-dark-gray-line: #d0d4da;
+@border-color-dark-gray-line-theme-dark: #606479;
 @border-color-dark-line: #9EA6B2;
 @border-color-dark-line-theme-dark: #878D9F;
 @border-color-highlight: #3685f2;
@@ -111,5 +110,3 @@
 @scroll-color-theme-dark: #ffffff;
 @scroll-thumb-color: #232e40;
 @scroll-thumb-color-theme-dark: #232e40;
-
-@water-mark-color-theme-dark: #878d9f;
diff --git a/src/less/widget/dynamicdatecombo/dynamicdatetime.combo.less b/src/less/widget/dynamicdatecombo/dynamicdatetime.combo.less
index 7aad9f6df..d15ab68dc 100644
--- a/src/less/widget/dynamicdatecombo/dynamicdatetime.combo.less
+++ b/src/less/widget/dynamicdatecombo/dynamicdatetime.combo.less
@@ -2,6 +2,6 @@
 
 .bi-dynamic-date-combo {
   & .date-font {
-    font-size: 16px;
+    font-size: @font-size-16;
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less b/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less
index 6a43b1d0f..4a725cd98 100644
--- a/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less
+++ b/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less
@@ -2,7 +2,7 @@
 @val: transform .3s ease;
 .bi-multilayer-select-tree-combo {
   & .trigger-icon-button{
-    font-size: 16px;
+    font-size: @font-size-16;
   }
   // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
   & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@@ -17,4 +17,4 @@
       .transition(@val);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/multilayersingletree/multilayersingletree.combo.less b/src/less/widget/multilayersingletree/multilayersingletree.combo.less
index ec139af05..a589309fd 100644
--- a/src/less/widget/multilayersingletree/multilayersingletree.combo.less
+++ b/src/less/widget/multilayersingletree/multilayersingletree.combo.less
@@ -2,7 +2,7 @@
 @val: transform .3s ease;
 .bi-multilayer-single-tree-combo {
   & .trigger-icon-button{
-    font-size: 16px;
+    font-size: @font-size-16;
   }
   // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
   & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@@ -17,4 +17,4 @@
       .transition(@val);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/multiselect/multiselect.insert.combo.less b/src/less/widget/multiselect/multiselect.insert.combo.less
index c8c55f8f7..ed721fce8 100644
--- a/src/less/widget/multiselect/multiselect.insert.combo.less
+++ b/src/less/widget/multiselect/multiselect.insert.combo.less
@@ -2,7 +2,7 @@
 @val: transform .3s ease;
 .bi-multi-select-insert-combo{
   & .multi-select-trigger-icon-button{
-    font-size: 16px;
+    font-size: @font-size-16;
   }
   // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
   & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@@ -17,4 +17,4 @@
       .transition(@val);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/multitree/multi.tree.combo.less b/src/less/widget/multitree/multi.tree.combo.less
index 230c0171f..73db11ef5 100644
--- a/src/less/widget/multitree/multi.tree.combo.less
+++ b/src/less/widget/multitree/multi.tree.combo.less
@@ -2,7 +2,7 @@
 @val: transform .3s ease;
 .bi-multi-tree-combo{
   & .multi-select-trigger-icon-button{
-    font-size: 16px;
+    font-size: @font-size-16;
   }
   // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
   & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@@ -17,4 +17,4 @@
       .transition(@val);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/numbereditor/number.editor.less b/src/less/widget/numbereditor/number.editor.less
index 8272c808b..6a86c5372 100644
--- a/src/less/widget/numbereditor/number.editor.less
+++ b/src/less/widget/numbereditor/number.editor.less
@@ -3,9 +3,9 @@
 .bi-number-editor {
   .border-radius(2px);
   & .pull-down-font {
-    font-size: 12px;
+    font-size: @font-size-12;
   }
   & .pull-up-font {
-    font-size: 12px;
+    font-size: @font-size-12;
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/searchmultiselect/searchmultiselect.less b/src/less/widget/searchmultiselect/searchmultiselect.less
index 99613ac2a..f924f044b 100644
--- a/src/less/widget/searchmultiselect/searchmultiselect.less
+++ b/src/less/widget/searchmultiselect/searchmultiselect.less
@@ -2,7 +2,7 @@
 
 .bi-search-multi-text-value-combo{
   & .multi-select-trigger-icon-button{
-    font-size: 16px;
+    font-size: @font-size-16;
   }
   &.combo-error {
     & .bi-multi-select-searcher {
@@ -11,4 +11,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/singleselect/singleselect.combo.less b/src/less/widget/singleselect/singleselect.combo.less
index b45d4902d..c32f46b04 100644
--- a/src/less/widget/singleselect/singleselect.combo.less
+++ b/src/less/widget/singleselect/singleselect.combo.less
@@ -2,7 +2,7 @@
 @val: transform .3s ease;
 .bi-single-select-combo{
   & .single-select-trigger-icon-button{
-    font-size: 16px;
+    font-size: @font-size-16;
   }
   // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
   & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@@ -17,4 +17,4 @@
       .transition(@val);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/widget/timecombo/timecombo.less b/src/less/widget/timecombo/timecombo.less
index e1ed24438..6ed973121 100644
--- a/src/less/widget/timecombo/timecombo.less
+++ b/src/less/widget/timecombo/timecombo.less
@@ -3,6 +3,6 @@
 .bi-time-trigger{
   & .show-text {
     //  ie10一下无背景色会鼠标穿透
-    .background-color(@background-color-default, 0);
+    .background-color(@color-bi-background-default, 0);
   }
-}
\ No newline at end of file
+}