update

bi/base.css

@@ -2,9 +2,9 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #1a1a1a;
@@ -16,9 +16,9 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
 .farbtastic {
   position: relative;

bi/base.js

@@ -3035,6 +3035,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         }
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -3047,6 +3048,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
                 case "click":
@@ -3092,6 +3094,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         st(e);
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -3104,6 +3107,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
             }

dist/base.css

@@ -2,9 +2,9 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #1a1a1a;
@@ -16,9 +16,9 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
 .farbtastic {
   position: relative;

dist/base.js

@@ -3035,6 +3035,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         }
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -3047,6 +3048,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
                 case "click":
@@ -3092,6 +3094,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         st(e);
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -3104,6 +3107,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
             }

dist/bundle.css

@@ -1597,9 +1597,9 @@ i {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #1a1a1a;
@@ -1611,9 +1611,9 @@ i {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
 .farbtastic {
   position: relative;

dist/bundle.js

@@ -28889,6 +28889,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         }
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -28901,6 +28902,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
                 case "click":
@@ -28946,6 +28948,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         st(e);
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -28958,6 +28961,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
             }

src/base/combination/combo.js

@@ -129,6 +129,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         }
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -141,6 +142,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
                 case "click":
@@ -186,6 +188,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                         st(e);
                     });
                     self.element.on("mouseleave." + self.getName(), function (e) {
+                        if (self.popupView) {
                             self.popupView.element.on("mouseenter." + self.getName(), function (e) {
                                 enterPopup = true;
                                 self.popupView.element.on("mouseleave." + self.getName(), function (e) {
@@ -198,6 +201,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                                     hide();
                                 }
                             }, 50);
+                        }
                     });
                     break;
             }

src/css/base/colorchooser/colorchooser.trigger.css

@@ -2,7 +2,7 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }

src/css/base/colorchooser/colorpicker/editor.colorpicker.css

@@ -2,7 +2,7 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-  -moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
+  box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
+  -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }

src/css/base/segment/segment.css

@@ -3,12 +3,12 @@
   overflow-x: hidden;
   overflow-y: hidden;
   background: #ffffff;
-  border-right: 1px solid #e8eaed;
-  border-top: 1px solid #e8eaed;
-  border-bottom: 1px solid #e8eaed;
+  border-right: 1px solid #d4dadd;
+  border-top: 1px solid #d4dadd;
+  border-bottom: 1px solid #d4dadd;
 }
 .bi-segment > .first-element {
-  border-left: 1px solid #e8eaed;
+  border-left: 1px solid #d4dadd;
   -webkit-border-radius: 6px 0px 0px 6px;
   -moz-border-radius: 6px 0px 0px 6px;
   border-radius: 6px 0px 0px 6px;
@@ -23,9 +23,9 @@
   overflow-x: hidden;
   overflow-y: hidden;
   background: #242640;
-  border-right: 1px solid #f2f4f7;
-  border-top: 1px solid #f2f4f7;
-  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #525466;
+  border-top: 1px solid #525466;
+  border-bottom: 1px solid #525466;
 }
 .bi-theme-dark .bi-segment > .first-element {
   border-left: 1px solid #242640;

src/css/base/single/button/button.css

@@ -46,7 +46,7 @@ body .bi-button.button-common.clear .b-font:before,
 body .bi-button.button-ignore,
 #body .bi-button.button-ignore {
   background-color: #ffffff;
-  border-color: #e8eaed;
+  border-color: #d4dadd;
 }
 body .bi-button.button-ignore,
 #body .bi-button.button-ignore,
@@ -147,7 +147,7 @@ body .bi-button.button-warning.disabled.base-disabled .b-font:before,
 body .bi-button.button-ignore.disabled,
 #body .bi-button.button-ignore.disabled {
   background: #ffffff !important;
-  border-color: #e8eaed !important;
+  border-color: #d4dadd !important;
 }
 body .bi-button.button-ignore.disabled,
 #body .bi-button.button-ignore.disabled,

src/css/base/table/table.collection.cell.css

@@ -9,14 +9,14 @@
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
 .bi-collection-table-cell.first-row {
-  border-top: 1px solid #e8eaed;
+  border-top: 1px solid #d4dadd;
 }
 .bi-collection-table-cell.first-col {
-  border-left: 1px solid #e8eaed;
+  border-left: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-collection-table-cell.first-row {
-  border-top: 1px solid #f2f4f7;
+  border-top: 1px solid #525466;
 }
 .bi-theme-dark .bi-collection-table-cell.first-col {
-  border-left: 1px solid #f2f4f7;
+  border-left: 1px solid #525466;
 }

src/css/base/table/table.css

@@ -5,24 +5,24 @@
   border-top: none;
 }
 .bi-table > div > div > table {
-  border-bottom: 1px solid #e8eaed;
-  border-right: 1px solid #e8eaed;
+  border-bottom: 1px solid #d4dadd;
+  border-right: 1px solid #d4dadd;
 }
 .bi-table > div.top-left > div > div > table {
-  border-bottom: 1px solid #e8eaed;
-  border-right: 1px solid #e8eaed;
+  border-bottom: 1px solid #d4dadd;
+  border-right: 1px solid #d4dadd;
 }
 .bi-table > div.top-right > div > div > table {
-  border-bottom: 1px solid #e8eaed;
-  border-right: 1px solid #e8eaed;
+  border-bottom: 1px solid #d4dadd;
+  border-right: 1px solid #d4dadd;
 }
 .bi-table > div.bottom-left > div > div > table {
-  border-bottom: 1px solid #e8eaed;
-  border-right: 1px solid #e8eaed;
+  border-bottom: 1px solid #d4dadd;
+  border-right: 1px solid #d4dadd;
 }
 .bi-table > div.bottom-right > div > div > table {
-  border-right: 1px solid #e8eaed;
-  border-bottom: 1px solid #e8eaed;
+  border-right: 1px solid #d4dadd;
+  border-bottom: 1px solid #d4dadd;
 }
 .bi-table > div > div > table,
 .bi-table > div > div > div > table {
@@ -46,33 +46,33 @@
 .bi-table > div > div > div > table > tbody > tr > td,
 .bi-table > div > div > table > thead > tr > td,
 .bi-table > div > div > div > table > thead > tr > td {
-  border-top: 1px solid #e8eaed;
-  border-left: 1px solid #e8eaed;
+  border-top: 1px solid #d4dadd;
+  border-left: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-table > div > div > table {
-  border-bottom: 1px solid #f2f4f7;
-  border-right: 1px solid #f2f4f7;
+  border-bottom: 1px solid #525466;
+  border-right: 1px solid #525466;
 }
 .bi-theme-dark .bi-table > div.top-left > div > div > table {
-  border-bottom: 1px solid #f2f4f7;
-  border-right: 1px solid #f2f4f7;
+  border-bottom: 1px solid #525466;
+  border-right: 1px solid #525466;
 }
 .bi-theme-dark .bi-table > div.top-right > div > div > table {
-  border-bottom: 1px solid #f2f4f7;
-  border-right: 1px solid #f2f4f7;
+  border-bottom: 1px solid #525466;
+  border-right: 1px solid #525466;
 }
 .bi-theme-dark .bi-table > div.bottom-left > div > div > table {
-  border-bottom: 1px solid #f2f4f7;
-  border-right: 1px solid #f2f4f7;
+  border-bottom: 1px solid #525466;
+  border-right: 1px solid #525466;
 }
 .bi-theme-dark .bi-table > div.bottom-right > div > div > table {
-  border-right: 1px solid #f2f4f7;
-  border-bottom: 1px solid #f2f4f7;
+  border-right: 1px solid #525466;
+  border-bottom: 1px solid #525466;
 }
 .bi-theme-dark .bi-table > div > div > table > tbody > tr > td,
 .bi-theme-dark .bi-table > div > div > div > table > tbody > tr > td,
 .bi-theme-dark .bi-table > div > div > table > thead > tr > td,
 .bi-theme-dark .bi-table > div > div > div > table > thead > tr > td {
-  border-top: 1px solid #f2f4f7;
-  border-left: 1px solid #f2f4f7;
+  border-top: 1px solid #525466;
+  border-left: 1px solid #525466;
 }

src/css/base/table/table.grid.cell.css

@@ -9,14 +9,14 @@
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
 .bi-grid-table-cell.first-row {
-  border-top: 1px solid #e8eaed;
+  border-top: 1px solid #d4dadd;
 }
 .bi-grid-table-cell.first-col {
-  border-left: 1px solid #e8eaed;
+  border-left: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-grid-table-cell.first-row {
-  border-top: 1px solid #f2f4f7;
+  border-top: 1px solid #525466;
 }
 .bi-theme-dark .bi-grid-table-cell.first-col {
-  border-left: 1px solid #f2f4f7;
+  border-left: 1px solid #525466;
 }

src/css/base/view/popupview.css

@@ -15,13 +15,13 @@
   line-height: 30px;
 }
 .bi-popup-view .list-view-toolbar > .center-element {
-  border-left: 1px solid #e8eaed;
+  border-left: 1px solid #d4dadd;
 }
 .bi-popup-view .list-view-toolbar > .first-element {
   border-left: none;
 }
 .bi-theme-dark .bi-popup-view .list-view-toolbar > .center-element {
-  border-left: 1px solid #f2f4f7;
+  border-left: 1px solid #525466;
 }
 .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
   border-left: none;

src/css/core/normalize2.css

@@ -34,11 +34,11 @@ textarea {
   margin: 0;
   padding: 0;
   outline: none;
-  border: 1px solid #e8eaed;
+  border: 1px solid #d4dadd;
 }
 .bi-theme-dark input,
 .bi-theme-dark textarea {
-  border: 1px solid #f2f4f7;
+  border: 1px solid #525466;
 }
 ul {
   list-style: disc;

src/css/core/utils/common.css

@@ -106,34 +106,34 @@
   color: #c4c9d1;
 }
 .bi-border {
-  border: 1px solid #e8eaed;
+  border: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-border {
-  border: 1px solid #f2f4f7;
+  border: 1px solid #525466;
 }
 .bi-border-left {
-  border-left: 1px solid #e8eaed;
+  border-left: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-border-left {
-  border-left: 1px solid #f2f4f7;
+  border-left: 1px solid #525466;
 }
 .bi-border-right {
-  border-right: 1px solid #e8eaed;
+  border-right: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-border-right {
-  border-right: 1px solid #f2f4f7;
+  border-right: 1px solid #525466;
 }
 .bi-border-top {
-  border-top: 1px solid #e8eaed;
+  border-top: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-border-top {
-  border-top: 1px solid #f2f4f7;
+  border-top: 1px solid #525466;
 }
 .bi-border-bottom {
-  border-bottom: 1px solid #e8eaed;
+  border-bottom: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-border-bottom {
-  border-bottom: 1px solid #f2f4f7;
+  border-bottom: 1px solid #525466;
 }
 .bi-keyword-red-mark {
   color: #ff4949;

src/css/widget/exceltable/exceltable.css

@@ -1,6 +1,6 @@
 .bi-excel-table > div.bottom-right > div > div > table {
-  border-right: 1px solid #e8eaed;
+  border-right: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
-  border-right: 1px solid #f2f4f7;
+  border-right: 1px solid #525466;
 }

src/css/widget/year/popup.year.css

@@ -2,13 +2,13 @@
   line-height: 30px;
 }
 .bi-year-popup .year-popup-navigation > .center-element {
-  border-left: 1px solid #e8eaed;
+  border-left: 1px solid #d4dadd;
 }
 .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
-  border-left: 1px solid #f2f4f7;
+  border-left: 1px solid #525466;
 }
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;

src/less/lib/constant.less

@@ -37,7 +37,7 @@
 @background-color-normal: #eff1f4;//
 @background-color-normal-theme-dark: #191B2B;//
 @background-color-highlight: #3f8ce8;
-@background-color-dark: #232e40;
+@background-color-dark: #d4dadd;
 @background-color-gray: #999999;
 @background-color-disabled: #cccccc;