Merge pull request #28 in FUI/fineui from ~GUY/fineui:master to master

* commit 'e9cd27a601aab60049f74f9989af73a96543bded':
  add
  全局样式
  主题
  add

.gitignore

@@ -1,5 +1,5 @@
 node_modules/
 /.idea/
-demo.js
+#demo.js
-demo.css
+#demo.css
 .DS_Store

bi/base.css

@@ -11,8 +11,11 @@
 .bi-color-chooser-popup .color-chooser-popup-more {
   background: #f4f4f4;
 }
-.bi-color-chooser-popup .color-chooser-popup-more:hover {
+.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title {
-  background: #d4dadd;
+  background: #191a2c;
+}
+.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more {
+  background: #191a2c;
 }
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
@@ -667,6 +670,10 @@ li.CodeMirror-hint-active {
   font-size: 16px;
   cursor: pointer;
 }
+.bi-theme-dark .bi-message-title {
+  background-color: #191a2c;
+  color: #b2b2b2;
+}
 .bi-message-text {
   font-size: 16px;
   -webkit-user-select: text;
@@ -681,6 +688,10 @@ li.CodeMirror-hint-active {
   color: #808080;
   font-size: 16px;
 }
+.bi-theme-dark .bi-message-content {
+  background-color: #202237;
+  color: #b2b2b2;
+}
 .bi-message-close {
   font-size: 25px;
 }
@@ -698,6 +709,9 @@ li.CodeMirror-hint-active {
   background: #f4f4f4;
   border-bottom: 1px solid #d4dadd;
 }
+.bi-theme-dark .bi-popup-panel .popup-panel-title {
+  background: #191a2c;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1093,6 +1107,16 @@ li.CodeMirror-hint-active {
 .bi-collection-table-cell.first-col {
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-collection-table-cell {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.bi-theme-dark .bi-collection-table-cell.first-row {
+  border-top: 1px solid #24273e;
+}
+.bi-theme-dark .bi-collection-table-cell.first-col {
+  border-left: 1px solid #24273e;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1155,6 +1179,33 @@ li.CodeMirror-hint-active {
   border-top: 1px solid #eaeaea;
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-table > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.top-left > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.top-right > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.bottom-left > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.bottom-right > div > div > table {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.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 #24273e;
+  border-left: 1px solid #24273e;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1176,6 +1227,19 @@ li.CodeMirror-hint-active {
 .bi-grid-table-cell.first-col {
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-grid-table-cell {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.bi-theme-dark .bi-grid-table-cell.first-row {
+  border-top: 1px solid #24273e;
+}
+.bi-theme-dark .bi-grid-table-cell.first-col {
+  border-left: 1px solid #24273e;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
@@ -1184,10 +1248,13 @@ li.CodeMirror-hint-active {
   transition-duration: 250ms;
   transition-timing-function: ease;
   user-select: none;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: #f4f4f4;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
   border-radius: 5px;
 }
+.bi-theme-dark .scrollbar-layout-main {
+  background-color: rgba(255, 255, 255, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
+}
 .scrollbar-layout-main-vertical {
   bottom: 0;
   right: 0;
@@ -1204,8 +1271,11 @@ li.CodeMirror-hint-active {
   height: 10px;
   left: 0;
   transition-property: background-color;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: #f4f4f4;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
+}
+.bi-theme-dark .scrollbar-layout-main-horizontal {
+  background-color: rgba(255, 255, 255, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@@ -1258,7 +1328,7 @@ li.CodeMirror-hint-active {
  */
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .public-scrollbar-face:after {
-  background-color: #c2c2c2;
+  background-color: #e2e2e2;
 }
 .bi-theme-dark .public-scrollbar-face:after {
   background-color: #7d7d7d;
@@ -1271,15 +1341,12 @@ li.CodeMirror-hint-active {
 .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
 .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
 .bi-theme-dark .public-scrollbar-faceActive:after {
-  background-color: #c2c2c2;
+  background-color: #e2e2e2;
 }
 .horizontal-scrollbar {
   bottom: 0;
   position: absolute;
 }
-.horizontal-scrollbar .public-scrollbar-main-horizontal {
-  background-color: #fff;
-}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1389,12 +1456,12 @@ li.CodeMirror-hint-active {
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-float-box {
-  background: #ffffff;
+  background-color: #ffffff;
+  color: #1a1a1a;
 }
-.bi-float-box .float-box-button {
+.bi-theme-dark .bi-float-box {
-  color: #ffffff;
+  background-color: #202237;
-  background: #009de3;
+  color: #b2b2b2;
-  border: 1px solid #d4dadd;
 }
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
@@ -1428,5 +1495,5 @@ li.CodeMirror-hint-active {
 }
 .bi-theme-dark .bi-list-view .list-view-outer {
   color: #b2b2b2;
-  background: #191a2c;
+  background: #202237;
 }

bi/case.js

@@ -2479,7 +2479,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
             isNeedAdjustHeight: false,
             el: {
                 type: "bi.text_item",
-                cls: "color-chooser-popup-more",
+                cls: "color-chooser-popup-more bi-list-item",
                 textAlign: "center",
                 height: 20,
                 text: BI.i18nText("BI-Basic_More") + "..."

bi/core.css

@@ -3062,29 +3062,29 @@
 .bi-list-item-select.disabled:active .bi-high-light {
   color: #c4c6c6 !important;
 }
-.bi-theme-dark .list-item-select:hover,
+.bi-theme-dark .bi-list-item-select:hover,
-.bi-theme-dark .list-item-select.hover {
+.bi-theme-dark .bi-list-item-select.hover {
   color: #009de3;
   background-color: #04070d;
 }
-.bi-theme-dark .list-item-select:active,
+.bi-theme-dark .bi-list-item-select:active,
-.bi-theme-dark .list-item-select.active {
+.bi-theme-dark .bi-list-item-select.active {
   color: #ffffff;
   background-color: #009de3;
 }
-.bi-theme-dark .list-item-select:active .bi-high-light,
+.bi-theme-dark .bi-list-item-select:active .bi-high-light,
-.bi-theme-dark .list-item-select.active .bi-high-light {
+.bi-theme-dark .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
 }
-.bi-theme-dark .list-item-select.disabled,
+.bi-theme-dark .bi-list-item-select.disabled,
-.bi-theme-dark .list-item-select.disabled:hover,
+.bi-theme-dark .bi-list-item-select.disabled:hover,
-.bi-theme-dark .list-item-select.disabled:active {
+.bi-theme-dark .bi-list-item-select.disabled:active {
   color: #c4c6c6 !important;
   background-color: transparent !important;
 }
-.bi-theme-dark .list-item-select.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
-.bi-theme-dark .list-item-select.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
-.bi-theme-dark .list-item-select.disabled:active .bi-high-light {
+.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
   color: #c4c6c6 !important;
 }
 /*****************cursor*****************/

bi/core.js

@@ -2960,52 +2960,24 @@ if (!window.BI) {
     //BI请求
     _.extend(BI, {
 
-        ajax: (function () {
+        ajax: function (option) {
-            var loading, timeoutToast;
+            option || (option = {});
-            return function (option) {
+            var async = option.async;
-                option || (option = {});
+            option.data = BI.cjkEncodeDO(option.data || {});
-                option.data = BI.extend({}, Data.SharingPool.cat("urlParameters"), option.data);
+
-                //encode
+            $.ajax({
-                encodeBIParam(option.data);
+                url: option.url,
-
+                type: "POST",
-                var async = option.async;
+                data: option.data,
-
+                async: async,
-                option.data = BI.cjkEncodeDO(option.data);
+                error: option.error,
-
+                complete: function (res, status) {
-
+                    if (BI.isFunction(option.complete)) {
-                $.ajax({
+                        option.complete(BI.jsonDecode(res.responseText), status);
-                    url: option.url,
-                    type: "POST",
-                    data: option.data,
-                    async: async,
-                    error: option.error,
-                    complete: function (res, status) {
-                        if (BI.isFunction(option.complete)) {
-                            option.complete(BI.jsonDecode(res.responseText), status);
-                        }
-                    }
-                });
-
-                function encodeBIParam(data) {
-                    for (var key in data) {
-                        if (_.isObject(data[key])) {
-                            data[key] = window.encodeURIComponent(BI.jsonEncode(data[key]));
-                        } else {
-                            data[key] = window.encodeURIComponent(data[key]);
-                        }
-                    }
-                }
-
-                function decodeBIParam(data) {
-                    for (var key in data) {
-                        data[key] = window.decodeURIComponent(data[key]);
-                        if (_.isObject(data[key])) {
-                            data[key] = BI.jsonDecode(data[key]);
-                        }
                     }
                 }
-            }
+            });
-        })()
+        }
     });
 })(jQuery);;(function () {
     function isEmpty(value) {
@@ -17035,6 +17007,24 @@ $(function () {
             });
         },
 
+        isColor: function (color) {
+            return this.isRGBColor(color) || this.isHexColor(color);
+        },
+
+        isRGBColor: function (color) {
+            if (!color) {
+                return false;
+            }
+            return color.substr(0, 3) === "rgb";
+        },
+
+        isHexColor: function (color) {
+            if (!color) {
+                return false;
+            }
+            return color[0] === "#" && color.length === 7;
+        },
+
         isDarkColor: function (hex) {
             if (!hex) {
                 return false;
@@ -17050,7 +17040,7 @@ $(function () {
         //获取对比颜色
         getContrastColor: function (color) {
             if (this.isDarkColor(color)) {
-                return "#ffffff";
+                return "#b2b2b2";
             }
             return "#1a1a1a";
         },

bi/widget.css

@@ -277,19 +277,19 @@
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-.bi-multi-select-check-pane .multi-select-continue-select {
+.bi-multi-select-check-pane {
   background-color: #f4f4f4;
 }
 .bi-multi-select-check-pane .multi-select-check-selected {
   color: #009de3;
   text-decoration: underline;
 }
+.bi-theme-dark .bi-multi-select-check-pane {
+  background-color: #191a2c;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-.bi-display-list {
-  background-color: #f4f4f4;
-}
 .bi-display-list .display-list-item {
   color: #808080;
 }

demo/dist/demo.css

@@ -0,0 +1,63 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.layout-bg-white {
+  background-color: #ffffff;
+}
+.layout-bg-gray {
+  background-color: #eeeeee;
+}
+.layout-bg1 {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.layout-bg2 {
+  color: #ffffff;
+  background-color: #008B8B;
+}
+.layout-bg3 {
+  color: #ffffff;
+  background-color: #6495ED;
+}
+.layout-bg4 {
+  color: #ffffff;
+  background-color: #ff69b4;
+}
+.layout-bg5 {
+  color: #ffffff;
+  background-color: #B8860B;
+}
+.layout-bg6 {
+  color: #ffffff;
+  background-color: #d9534f;
+}
+.layout-bg7 {
+  color: #ffffff;
+  background-color: #ea4738;
+}
+.layout-bg8 {
+  color: #ffffff;
+  background-color: #6495ed;
+}
+.demo-main .bg1 {
+  background-color: #178cdf;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.demo-north {
+  background-color: #3c8dbc;
+}
+.demo-north .logo {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #ffffff;
+  background-color: #367fa9;
+  font-size: 20px;
+  font-weight: 300;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.demo-west {
+  border-right: 1px solid #eaeaea;
+}

docs/base.css

@@ -11,8 +11,11 @@
 .bi-color-chooser-popup .color-chooser-popup-more {
   background: #f4f4f4;
 }
-.bi-color-chooser-popup .color-chooser-popup-more:hover {
+.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title {
-  background: #d4dadd;
+  background: #191a2c;
+}
+.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more {
+  background: #191a2c;
 }
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
@@ -667,6 +670,10 @@ li.CodeMirror-hint-active {
   font-size: 16px;
   cursor: pointer;
 }
+.bi-theme-dark .bi-message-title {
+  background-color: #191a2c;
+  color: #b2b2b2;
+}
 .bi-message-text {
   font-size: 16px;
   -webkit-user-select: text;
@@ -681,6 +688,10 @@ li.CodeMirror-hint-active {
   color: #808080;
   font-size: 16px;
 }
+.bi-theme-dark .bi-message-content {
+  background-color: #202237;
+  color: #b2b2b2;
+}
 .bi-message-close {
   font-size: 25px;
 }
@@ -698,6 +709,9 @@ li.CodeMirror-hint-active {
   background: #f4f4f4;
   border-bottom: 1px solid #d4dadd;
 }
+.bi-theme-dark .bi-popup-panel .popup-panel-title {
+  background: #191a2c;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1093,6 +1107,16 @@ li.CodeMirror-hint-active {
 .bi-collection-table-cell.first-col {
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-collection-table-cell {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.bi-theme-dark .bi-collection-table-cell.first-row {
+  border-top: 1px solid #24273e;
+}
+.bi-theme-dark .bi-collection-table-cell.first-col {
+  border-left: 1px solid #24273e;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1155,6 +1179,33 @@ li.CodeMirror-hint-active {
   border-top: 1px solid #eaeaea;
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-table > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.top-left > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.top-right > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.bottom-left > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.bottom-right > div > div > table {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.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 #24273e;
+  border-left: 1px solid #24273e;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1176,6 +1227,19 @@ li.CodeMirror-hint-active {
 .bi-grid-table-cell.first-col {
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-grid-table-cell {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.bi-theme-dark .bi-grid-table-cell.first-row {
+  border-top: 1px solid #24273e;
+}
+.bi-theme-dark .bi-grid-table-cell.first-col {
+  border-left: 1px solid #24273e;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
@@ -1184,10 +1248,13 @@ li.CodeMirror-hint-active {
   transition-duration: 250ms;
   transition-timing-function: ease;
   user-select: none;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: #f4f4f4;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
   border-radius: 5px;
 }
+.bi-theme-dark .scrollbar-layout-main {
+  background-color: rgba(255, 255, 255, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
+}
 .scrollbar-layout-main-vertical {
   bottom: 0;
   right: 0;
@@ -1204,8 +1271,11 @@ li.CodeMirror-hint-active {
   height: 10px;
   left: 0;
   transition-property: background-color;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: #f4f4f4;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
+}
+.bi-theme-dark .scrollbar-layout-main-horizontal {
+  background-color: rgba(255, 255, 255, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@@ -1258,7 +1328,7 @@ li.CodeMirror-hint-active {
  */
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .public-scrollbar-face:after {
-  background-color: #c2c2c2;
+  background-color: #e2e2e2;
 }
 .bi-theme-dark .public-scrollbar-face:after {
   background-color: #7d7d7d;
@@ -1271,15 +1341,12 @@ li.CodeMirror-hint-active {
 .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
 .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
 .bi-theme-dark .public-scrollbar-faceActive:after {
-  background-color: #c2c2c2;
+  background-color: #e2e2e2;
 }
 .horizontal-scrollbar {
   bottom: 0;
   position: absolute;
 }
-.horizontal-scrollbar .public-scrollbar-main-horizontal {
-  background-color: #fff;
-}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
@@ -1389,12 +1456,12 @@ li.CodeMirror-hint-active {
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-float-box {
-  background: #ffffff;
+  background-color: #ffffff;
+  color: #1a1a1a;
 }
-.bi-float-box .float-box-button {
+.bi-theme-dark .bi-float-box {
-  color: #ffffff;
+  background-color: #202237;
-  background: #009de3;
+  color: #b2b2b2;
-  border: 1px solid #d4dadd;
 }
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
@@ -1428,5 +1495,5 @@ li.CodeMirror-hint-active {
 }
 .bi-theme-dark .bi-list-view .list-view-outer {
   color: #b2b2b2;
-  background: #191a2c;
+  background: #202237;
 }

docs/case.js

@@ -2479,7 +2479,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
             isNeedAdjustHeight: false,
             el: {
                 type: "bi.text_item",
-                cls: "color-chooser-popup-more",
+                cls: "color-chooser-popup-more bi-list-item",
                 textAlign: "center",
                 height: 20,
                 text: BI.i18nText("BI-Basic_More") + "..."
@@ -9749,12 +9749,18 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, {
         });
         this.table.on(BI.Table.EVENT_TABLE_AFTER_REGION_RESIZE, function () {
             o.regionColumnSize = this.getRegionColumnSize();
-            o.columnSize = this.getColumnSize();
+            var columnSize = this.getColumnSize();
+            var length = o.columnSize.length - columnSize.length;
+            o.columnSize = columnSize.slice();
+            o.columnSize.splice(columnSize.length, length, "");
             self.fireEvent(BI.Table.EVENT_TABLE_AFTER_REGION_RESIZE, arguments);
         });
         this.table.on(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, function () {
             o.regionColumnSize = this.getRegionColumnSize();
-            o.columnSize = this.getColumnSize();
+            var columnSize = this.getColumnSize();
+            var length = o.columnSize.length - columnSize.length;
+            o.columnSize = columnSize.slice();
+            o.columnSize.splice(columnSize.length, length, "");
             self.fireEvent(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, arguments);
         });
     },
@@ -9796,7 +9802,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, {
     },
 
     getColumnSize: function () {
-        return this.table.getColumnSize();
+        return this.options.columnSize;
     },
 
     setRegionColumnSize: function (columnSize) {
@@ -9991,12 +9997,19 @@ BI.extend(BI.DynamicSummaryTreeTable, {
         });
 
         if (cols.length > 0) {
+            var nHeader = [], nItems = [];
             BI.each(header, function (i, node) {
-                BI.removeAt(node, cols);
+                var nNode = node.slice();
+                BI.removeAt(nNode, cols);
+                nHeader.push(nNode);
             });
             BI.each(items, function (i, node) {
-                BI.removeAt(node, cols);
+                var nNode = node.slice();
+                BI.removeAt(nNode, cols);
+                nItems.push(nNode);;
             });
+            header = nHeader;
+            items = nItems;
         }
         return {items: items, header: header, deletedCols: cols};
     }

docs/core.css

@@ -3062,29 +3062,29 @@
 .bi-list-item-select.disabled:active .bi-high-light {
   color: #c4c6c6 !important;
 }
-.bi-theme-dark .list-item-select:hover,
+.bi-theme-dark .bi-list-item-select:hover,
-.bi-theme-dark .list-item-select.hover {
+.bi-theme-dark .bi-list-item-select.hover {
   color: #009de3;
   background-color: #04070d;
 }
-.bi-theme-dark .list-item-select:active,
+.bi-theme-dark .bi-list-item-select:active,
-.bi-theme-dark .list-item-select.active {
+.bi-theme-dark .bi-list-item-select.active {
   color: #ffffff;
   background-color: #009de3;
 }
-.bi-theme-dark .list-item-select:active .bi-high-light,
+.bi-theme-dark .bi-list-item-select:active .bi-high-light,
-.bi-theme-dark .list-item-select.active .bi-high-light {
+.bi-theme-dark .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
 }
-.bi-theme-dark .list-item-select.disabled,
+.bi-theme-dark .bi-list-item-select.disabled,
-.bi-theme-dark .list-item-select.disabled:hover,
+.bi-theme-dark .bi-list-item-select.disabled:hover,
-.bi-theme-dark .list-item-select.disabled:active {
+.bi-theme-dark .bi-list-item-select.disabled:active {
   color: #c4c6c6 !important;
   background-color: transparent !important;
 }
-.bi-theme-dark .list-item-select.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
-.bi-theme-dark .list-item-select.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
-.bi-theme-dark .list-item-select.disabled:active .bi-high-light {
+.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
   color: #c4c6c6 !important;
 }
 /*****************cursor*****************/

docs/core.js

@@ -14102,52 +14102,24 @@ if (!window.BI) {
     //BI请求
     _.extend(BI, {
 
-        ajax: (function () {
+        ajax: function (option) {
-            var loading, timeoutToast;
+            option || (option = {});
-            return function (option) {
+            var async = option.async;
-                option || (option = {});
+            option.data = BI.cjkEncodeDO(option.data || {});
-                option.data = BI.extend({}, Data.SharingPool.cat("urlParameters"), option.data);
+
-                //encode
+            $.ajax({
-                encodeBIParam(option.data);
+                url: option.url,
-
+                type: "POST",
-                var async = option.async;
+                data: option.data,
-
+                async: async,
-                option.data = BI.cjkEncodeDO(option.data);
+                error: option.error,
-
+                complete: function (res, status) {
-
+                    if (BI.isFunction(option.complete)) {
-                $.ajax({
+                        option.complete(BI.jsonDecode(res.responseText), status);
-                    url: option.url,
-                    type: "POST",
-                    data: option.data,
-                    async: async,
-                    error: option.error,
-                    complete: function (res, status) {
-                        if (BI.isFunction(option.complete)) {
-                            option.complete(BI.jsonDecode(res.responseText), status);
-                        }
-                    }
-                });
-
-                function encodeBIParam(data) {
-                    for (var key in data) {
-                        if (_.isObject(data[key])) {
-                            data[key] = window.encodeURIComponent(BI.jsonEncode(data[key]));
-                        } else {
-                            data[key] = window.encodeURIComponent(data[key]);
-                        }
-                    }
-                }
-
-                function decodeBIParam(data) {
-                    for (var key in data) {
-                        data[key] = window.decodeURIComponent(data[key]);
-                        if (_.isObject(data[key])) {
-                            data[key] = BI.jsonDecode(data[key]);
-                        }
                     }
                 }
-            }
+            });
-        })()
+        }
     });
 })(jQuery);/**
  * 客户端观察者，主要处理事件的添加、删除、执行等
@@ -22659,6 +22631,24 @@ $(function () {
             });
         },
 
+        isColor: function (color) {
+            return this.isRGBColor(color) || this.isHexColor(color);
+        },
+
+        isRGBColor: function (color) {
+            if (!color) {
+                return false;
+            }
+            return color.substr(0, 3) === "rgb";
+        },
+
+        isHexColor: function (color) {
+            if (!color) {
+                return false;
+            }
+            return color[0] === "#" && color.length === 7;
+        },
+
         isDarkColor: function (hex) {
             if (!hex) {
                 return false;
@@ -22674,7 +22664,7 @@ $(function () {
         //获取对比颜色
         getContrastColor: function (color) {
             if (this.isDarkColor(color)) {
-                return "#ffffff";
+                return "#b2b2b2";
             }
             return "#1a1a1a";
         },

docs/demo.css

@@ -0,0 +1,63 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.layout-bg-white {
+  background-color: #ffffff;
+}
+.layout-bg-gray {
+  background-color: #eeeeee;
+}
+.layout-bg1 {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.layout-bg2 {
+  color: #ffffff;
+  background-color: #008B8B;
+}
+.layout-bg3 {
+  color: #ffffff;
+  background-color: #6495ED;
+}
+.layout-bg4 {
+  color: #ffffff;
+  background-color: #ff69b4;
+}
+.layout-bg5 {
+  color: #ffffff;
+  background-color: #B8860B;
+}
+.layout-bg6 {
+  color: #ffffff;
+  background-color: #d9534f;
+}
+.layout-bg7 {
+  color: #ffffff;
+  background-color: #ea4738;
+}
+.layout-bg8 {
+  color: #ffffff;
+  background-color: #6495ed;
+}
+.demo-main .bg1 {
+  background-color: #178cdf;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.demo-north {
+  background-color: #3c8dbc;
+}
+.demo-north .logo {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #ffffff;
+  background-color: #367fa9;
+  font-size: 20px;
+  font-weight: 300;
+}
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
+.demo-west {
+  border-right: 1px solid #eaeaea;
+}

docs/resource.css

@@ -109,7 +109,7 @@ textarea::-webkit-scrollbar-thumb {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
   -webkit-appearance: none;
-  background-color: #191a2c;
+  background-color: rgba(255, 255, 255, 0.1);
   width: 6px;
   height: 6px;
 }

docs/widget.css

@@ -277,19 +277,19 @@
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-.bi-multi-select-check-pane .multi-select-continue-select {
+.bi-multi-select-check-pane {
   background-color: #f4f4f4;
 }
 .bi-multi-select-check-pane .multi-select-check-selected {
   color: #009de3;
   text-decoration: underline;
 }
+.bi-theme-dark .bi-multi-select-check-pane {
+  background-color: #191a2c;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-.bi-display-list {
-  background-color: #f4f4f4;
-}
 .bi-display-list .display-list-item {
   color: #808080;
 }

src/case/colorchooser/colorchooser.popup.js

@@ -94,7 +94,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
             isNeedAdjustHeight: false,
             el: {
                 type: "bi.text_item",
-                cls: "color-chooser-popup-more",
+                cls: "color-chooser-popup-more bi-list-item",
                 textAlign: "center",
                 height: 20,
                 text: BI.i18nText("BI-Basic_More") + "..."

src/core/base.js

@@ -1065,51 +1065,23 @@ if (!window.BI) {
     //BI请求
     _.extend(BI, {
 
-        ajax: (function () {
+        ajax: function (option) {
-            var loading, timeoutToast;
+            option || (option = {});
-            return function (option) {
+            var async = option.async;
-                option || (option = {});
+            option.data = BI.cjkEncodeDO(option.data || {});
-                option.data = BI.extend({}, Data.SharingPool.cat("urlParameters"), option.data);
+
-                //encode
+            $.ajax({
-                encodeBIParam(option.data);
+                url: option.url,
-
+                type: "POST",
-                var async = option.async;
+                data: option.data,
-
+                async: async,
-                option.data = BI.cjkEncodeDO(option.data);
+                error: option.error,
-
+                complete: function (res, status) {
-
+                    if (BI.isFunction(option.complete)) {
-                $.ajax({
+                        option.complete(BI.jsonDecode(res.responseText), status);
-                    url: option.url,
-                    type: "POST",
-                    data: option.data,
-                    async: async,
-                    error: option.error,
-                    complete: function (res, status) {
-                        if (BI.isFunction(option.complete)) {
-                            option.complete(BI.jsonDecode(res.responseText), status);
-                        }
-                    }
-                });
-
-                function encodeBIParam(data) {
-                    for (var key in data) {
-                        if (_.isObject(data[key])) {
-                            data[key] = window.encodeURIComponent(BI.jsonEncode(data[key]));
-                        } else {
-                            data[key] = window.encodeURIComponent(data[key]);
-                        }
-                    }
-                }
-
-                function decodeBIParam(data) {
-                    for (var key in data) {
-                        data[key] = window.decodeURIComponent(data[key]);
-                        if (_.isObject(data[key])) {
-                            data[key] = BI.jsonDecode(data[key]);
-                        }
                     }
                 }
-            }
+            });
-        })()
+        }
     });
 })(jQuery);

src/core/func/function.js

@@ -105,6 +105,24 @@ $(function () {
             });
         },
 
+        isColor: function (color) {
+            return this.isRGBColor(color) || this.isHexColor(color);
+        },
+
+        isRGBColor: function (color) {
+            if (!color) {
+                return false;
+            }
+            return color.substr(0, 3) === "rgb";
+        },
+
+        isHexColor: function (color) {
+            if (!color) {
+                return false;
+            }
+            return color[0] === "#" && color.length === 7;
+        },
+
         isDarkColor: function (hex) {
             if (!hex) {
                 return false;
@@ -120,7 +138,7 @@ $(function () {
         //获取对比颜色
         getContrastColor: function (color) {
             if (this.isDarkColor(color)) {
-                return "#ffffff";
+                return "#b2b2b2";
             }
             return "#1a1a1a";
         },

src/css/base/colorchooser/colorchooser.popup.css

@@ -8,6 +8,9 @@
 .bi-color-chooser-popup .color-chooser-popup-more {
   background: #f4f4f4;
 }
-.bi-color-chooser-popup .color-chooser-popup-more:hover {
+.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title {
-  background: #d4dadd;
+  background: #191a2c;
+}
+.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more {
+  background: #191a2c;
 }

src/css/base/foundation/bi.message.css

@@ -12,6 +12,10 @@
   font-size: 16px;
   cursor: pointer;
 }
+.bi-theme-dark .bi-message-title {
+  background-color: #191a2c;
+  color: #b2b2b2;
+}
 .bi-message-text {
   font-size: 16px;
   -webkit-user-select: text;
@@ -26,6 +30,10 @@
   color: #808080;
   font-size: 16px;
 }
+.bi-theme-dark .bi-message-content {
+  background-color: #202237;
+  color: #b2b2b2;
+}
 .bi-message-close {
   font-size: 25px;
 }

src/css/base/layer/layer.panel.css

@@ -5,3 +5,6 @@
   background: #f4f4f4;
   border-bottom: 1px solid #d4dadd;
 }
+.bi-theme-dark .bi-popup-panel .popup-panel-title {
+  background: #191a2c;
+}

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

@@ -19,3 +19,13 @@
 .bi-collection-table-cell.first-col {
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-collection-table-cell {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.bi-theme-dark .bi-collection-table-cell.first-row {
+  border-top: 1px solid #24273e;
+}
+.bi-theme-dark .bi-collection-table-cell.first-col {
+  border-left: 1px solid #24273e;
+}

src/css/base/table/table.css

@@ -52,3 +52,30 @@
   border-top: 1px solid #eaeaea;
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-table > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.top-left > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.top-right > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.bottom-left > div > div > table {
+  border-bottom: 1px solid #24273e;
+  border-right: 1px solid #24273e;
+}
+.bi-theme-dark .bi-table > div.bottom-right > div > div > table {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.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 #24273e;
+  border-left: 1px solid #24273e;
+}

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

@@ -19,3 +19,13 @@
 .bi-grid-table-cell.first-col {
   border-left: 1px solid #eaeaea;
 }
+.bi-theme-dark .bi-grid-table-cell {
+  border-right: 1px solid #24273e;
+  border-bottom: 1px solid #24273e;
+}
+.bi-theme-dark .bi-grid-table-cell.first-row {
+  border-top: 1px solid #24273e;
+}
+.bi-theme-dark .bi-grid-table-cell.first-col {
+  border-left: 1px solid #24273e;
+}

src/css/base/table/table.grid.scrollbar.css

@@ -1,3 +1,6 @@
+/****添加计算宽度的--运算符直接需要space****/
+/****** common color(常用颜色,可用于普遍场景) *****/
+/**** custom color(自定义颜色,用于特定场景) ****/
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
@@ -6,10 +9,13 @@
   transition-duration: 250ms;
   transition-timing-function: ease;
   user-select: none;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: #f4f4f4;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
   border-radius: 5px;
 }
+.bi-theme-dark .scrollbar-layout-main {
+  background-color: rgba(255, 255, 255, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
+}
 .scrollbar-layout-main-vertical {
   bottom: 0;
   right: 0;
@@ -26,8 +32,11 @@
   height: 10px;
   left: 0;
   transition-property: background-color;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: #f4f4f4;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000);
+}
+.bi-theme-dark .scrollbar-layout-main-horizontal {
+  background-color: rgba(255, 255, 255, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff);
 }
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .scrollbar-layout-main-horizontal.public-scrollbar-main-active,
@@ -80,7 +89,7 @@
  */
 /* Touching the scroll-track directly makes the scroll-track bolder */
 .public-scrollbar-face:after {
-  background-color: #c2c2c2;
+  background-color: #e2e2e2;
 }
 .bi-theme-dark .public-scrollbar-face:after {
   background-color: #7d7d7d;
@@ -93,12 +102,9 @@
 .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after,
 .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after,
 .bi-theme-dark .public-scrollbar-faceActive:after {
-  background-color: #c2c2c2;
+  background-color: #e2e2e2;
 }
 .horizontal-scrollbar {
   bottom: 0;
   position: absolute;
 }
-.horizontal-scrollbar .public-scrollbar-main-horizontal {
-  background-color: #fff;
-}

src/css/base/view/floatboxview.css

@@ -2,10 +2,10 @@
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
 .bi-float-box {
-  background: #ffffff;
+  background-color: #ffffff;
+  color: #1a1a1a;
 }
-.bi-float-box .float-box-button {
+.bi-theme-dark .bi-float-box {
-  color: #ffffff;
+  background-color: #202237;
-  background: #009de3;
+  color: #b2b2b2;
-  border: 1px solid #d4dadd;
 }

src/css/base/view/popupview.css

@@ -30,5 +30,5 @@
 }
 .bi-theme-dark .bi-list-view .list-view-outer {
   color: #b2b2b2;
-  background: #191a2c;
+  background: #202237;
 }

src/css/core/utils/common.css

@@ -160,28 +160,28 @@
 .bi-list-item-select.disabled:active .bi-high-light {
   color: #c4c6c6 !important;
 }
-.bi-theme-dark .list-item-select:hover,
+.bi-theme-dark .bi-list-item-select:hover,
-.bi-theme-dark .list-item-select.hover {
+.bi-theme-dark .bi-list-item-select.hover {
   color: #009de3;
   background-color: #04070d;
 }
-.bi-theme-dark .list-item-select:active,
+.bi-theme-dark .bi-list-item-select:active,
-.bi-theme-dark .list-item-select.active {
+.bi-theme-dark .bi-list-item-select.active {
   color: #ffffff;
   background-color: #009de3;
 }
-.bi-theme-dark .list-item-select:active .bi-high-light,
+.bi-theme-dark .bi-list-item-select:active .bi-high-light,
-.bi-theme-dark .list-item-select.active .bi-high-light {
+.bi-theme-dark .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
 }
-.bi-theme-dark .list-item-select.disabled,
+.bi-theme-dark .bi-list-item-select.disabled,
-.bi-theme-dark .list-item-select.disabled:hover,
+.bi-theme-dark .bi-list-item-select.disabled:hover,
-.bi-theme-dark .list-item-select.disabled:active {
+.bi-theme-dark .bi-list-item-select.disabled:active {
   color: #c4c6c6 !important;
   background-color: transparent !important;
 }
-.bi-theme-dark .list-item-select.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
-.bi-theme-dark .list-item-select.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
-.bi-theme-dark .list-item-select.disabled:active .bi-high-light {
+.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
   color: #c4c6c6 !important;
 }

src/css/resource/app.css

@@ -109,7 +109,7 @@ textarea::-webkit-scrollbar-thumb {
 .bi-theme-dark div::-webkit-scrollbar,
 .bi-theme-dark textarea::-webkit-scrollbar {
   -webkit-appearance: none;
-  background-color: #191a2c;
+  background-color: rgba(255, 255, 255, 0.1);
   width: 6px;
   height: 6px;
 }

src/css/widget/multiselect/check/multiselect.check.pane.css

@@ -1,10 +1,13 @@
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-.bi-multi-select-check-pane .multi-select-continue-select {
+.bi-multi-select-check-pane {
   background-color: #f4f4f4;
 }
 .bi-multi-select-check-pane .multi-select-check-selected {
   color: #009de3;
   text-decoration: underline;
 }
+.bi-theme-dark .bi-multi-select-check-pane {
+  background-color: #191a2c;
+}

src/css/widget/multiselect/check/multiselect.display.css

@@ -1,9 +1,6 @@
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-.bi-display-list {
-  background-color: #f4f4f4;
-}
 .bi-display-list .display-list-item {
   color: #808080;
 }

src/less/base/colorchooser/colorchooser.popup.less

@@ -1,14 +1,22 @@
 @import "../../bibase";
 
-.bi-color-chooser-popup{
+.bi-color-chooser-popup {
-  & .color-chooser-popup-title{
+  & .color-chooser-popup-title {
     background: @color-bi-background-gray;
     border-bottom: 1px solid @color-bi-split-dark;
   }
-  & .color-chooser-popup-more{
+  & .color-chooser-popup-more {
     background: @color-bi-background-gray;
-    &:hover{
+  }
-      background: @color-bi-background-dark;
+}
+
+.bi-theme-dark {
+  .bi-color-chooser-popup {
+    & .color-chooser-popup-title {
+      background: @color-bi-background-normal-theme-dark;
+    }
+    & .color-chooser-popup-more {
+      background: @color-bi-background-normal-theme-dark;
     }
   }
 }

src/less/base/foundation/bi.message.less

@@ -11,16 +11,32 @@
   font-size: 16px;
   cursor: pointer;
 }
+
+.bi-theme-dark {
+  .bi-message-title {
+    background-color: @color-bi-background-normal-theme-dark;
+    color: @color-bi-text-theme-dark;
+  }
+}
+
 .bi-message-text {
   font-size: 16px;
   .user-select(text);
 }
+
 .bi-message-content {
   background-color: @color-bi-background-default;
   color: @color-bi-text-gray;
   font-size: 16px;
 }
 
+.bi-theme-dark {
+  .bi-message-content {
+    background-color: @color-bi-background-default-theme-dark;
+    color: @color-bi-text-theme-dark;
+  }
+}
+
 .bi-message-close {
   font-size: 25px;
 }

src/less/base/layer/layer.panel.less

@@ -1,8 +1,16 @@
 @import "../../bibase";
 
-.bi-popup-panel{
+.bi-popup-panel {
-  & .popup-panel-title{
+  & .popup-panel-title {
     background: @color-bi-background-gray;
     border-bottom: 1px solid @color-bi-split-dark;
   }
 }
+
+.bi-theme-dark {
+  .bi-popup-panel {
+    & .popup-panel-title {
+      background: @color-bi-background-normal-theme-dark;
+    }
+  }
+}

src/less/base/table/table.collection.cell.less

@@ -11,3 +11,15 @@
     border-left: 1px solid @border-color-line;
   }
 }
+.bi-theme-dark{
+  .bi-collection-table-cell{
+    border-right: 1px solid @border-color-line-theme-dark;
+    border-bottom: 1px solid @border-color-line-theme-dark;
+    &.first-row {
+      border-top: 1px solid @border-color-line-theme-dark;
+    }
+    &.first-col {
+      border-left: 1px solid @border-color-line-theme-dark;
+    }
+  }
+}

src/less/base/table/table.grid.cell.less

@@ -11,3 +11,15 @@
     border-left: 1px solid @border-color-line;
   }
 }
+.bi-theme-dark{
+  .bi-grid-table-cell{
+    border-right: 1px solid @border-color-line-theme-dark;
+    border-bottom: 1px solid @border-color-line-theme-dark;
+    &.first-row {
+      border-top: 1px solid @border-color-line-theme-dark;
+    }
+    &.first-col {
+      border-left: 1px solid @border-color-line-theme-dark;
+    }
+  }
+}

src/less/base/table/table.grid.scrollbar.less

@@ -1,3 +1,4 @@
+@import "../../bibase";
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
@@ -6,11 +7,17 @@
   transition-duration: 250ms;
   transition-timing-function: ease;
   user-select: none;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: @scroll-color;
-  filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000)";
   border-radius: 5px;
 }
 
+.bi-theme-dark {
+  .scrollbar-layout-main {
+    background-color: @scroll-color-theme-dark;
+    filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff)";
+  }
+}
+
 .scrollbar-layout-main-vertical {
   bottom: 0;
   right: 0;
@@ -29,8 +36,14 @@
   height: 10px;
   left: 0;
   transition-property: background-color;
-  background-color: rgba(0, 0, 0, 0.1);
+  background-color: @scroll-color;
-  filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19000000,endColorstr=#19000000)";
+}
+
+.bi-theme-dark {
+  .scrollbar-layout-main-horizontal {
+    background-color: @scroll-color-theme-dark;
+    filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff)";
+  }
 }
 
 /* Touching the scroll-track directly makes the scroll-track bolder */
@@ -103,26 +116,26 @@
 }
 
 .public-scrollbar-face:after {
-  background-color: #c2c2c2;
+  background-color: @scroll-thumb-color;
 }
 
 .bi-theme-dark {
   .public-scrollbar-face:after {
-    background-color: #7d7d7d;
+    background-color: @scroll-thumb-color-theme-dark;
   }
 }
 
 .public-scrollbar-main:hover .public-scrollbar-face:after,
 .public-scrollbar-main-active .public-scrollbar-face:after,
 .public-scrollbar-faceActive:after {
-  background-color: #7d7d7d;
+  background-color: @scroll-thumb-focus-color;
 }
 
 .bi-theme-dark {
   .public-scrollbar-main:hover .public-scrollbar-face:after,
   .public-scrollbar-main-active .public-scrollbar-face:after,
   .public-scrollbar-faceActive:after {
-    background-color: #c2c2c2;
+    background-color: @scroll-thumb-focus-color-theme-dark;
   }
 }
 
@@ -130,8 +143,5 @@
 .horizontal-scrollbar {
   bottom: 0;
   position: absolute;
-  & .public-scrollbar-main-horizontal {
-    background-color: #fff;
-  }
 }
 

src/less/base/table/table.less

@@ -77,3 +77,35 @@
     }
   }
 }
+
+.bi-theme-dark {
+  .bi-table {
+    & > div > div > table {
+      border-bottom: 1px solid @border-color-line-theme-dark;
+      border-right: 1px solid @border-color-line-theme-dark;
+    }
+    & > div.top-left > div > div > table {
+      border-bottom: 1px solid @border-color-line-theme-dark;
+      border-right: 1px solid @border-color-line-theme-dark;
+    }
+    & > div.top-right > div > div > table {
+      border-bottom: 1px solid @border-color-line-theme-dark;
+      border-right: 1px solid @border-color-line-theme-dark;
+    }
+    & > div.bottom-left > div > div > table {
+      border-bottom: 1px solid @border-color-line-theme-dark;
+      border-right: 1px solid @border-color-line-theme-dark;
+    }
+    & > div.bottom-right > div > div > table {
+      border-right: 1px solid @border-color-line-theme-dark;
+      border-bottom: 1px solid @border-color-line-theme-dark;
+    }
+
+    & > div > div > table, & > div > div > div > table {
+      & > tbody > tr > td, & > thead > tr > td {
+        border-top: 1px solid @border-color-line-theme-dark;
+        border-left: 1px solid @border-color-line-theme-dark;
+      }
+    }
+  }
+}

src/less/base/view/floatboxview.less

@@ -1,9 +1,13 @@
 @import "../../bibase";
-.bi-float-box{
+
-  background: @color-bi-background-default;
+.bi-float-box {
-  & .float-box-button{
+  background-color: @color-bi-background-default;
-    color: @color-bi-text;
+  color: @color-bi-text-black;
-    background: @color-bi-background-highlight;
+}
-    border: 1px solid @color-bi-border-normal;
+
+.bi-theme-dark {
+  .bi-float-box {
+    background-color: @color-bi-background-default-theme-dark;
+    color: @color-bi-text-theme-dark;
   }
 }

src/less/base/view/popupview.less

@@ -30,7 +30,7 @@
   .bi-list-view {
     & .list-view-outer {
       color: @color-bi-text-theme-dark;
-      background: @color-bi-background-theme-dark;
+      background: @color-bi-background-default-theme-dark;
     }
   }
 }

src/less/core/utils/common.less

@@ -132,7 +132,7 @@
 }
 
 .bi-theme-dark {
-  .list-item-select {
+  .bi-list-item-select {
     &:hover, &.hover {
       color: @color-bi-text-highlight;
       background-color: @color-list-item-hover;

src/less/lib/colors.less

@@ -6,7 +6,7 @@
 //默认字体颜色
 @color-bi-text-black: @font-color-normal;
 //深色主题默认字体颜色
-@color-bi-text-theme-dark: #b2b2b2;
+@color-bi-text-theme-dark: @font-color-normal-theme-dark;
 //深灰色字体颜色
 @color-bi-text-dark: @font-color-dark;
 //灰色字体颜色
@@ -26,12 +26,13 @@
 //标红色
 @color-bi-text-redmark: @font-color-redmark;
 
+//普通背景
+@color-bi-background-normal: @background-color-normal;
+@color-bi-background-normal-theme-dark: @background-color-normal-theme-dark;
 //默认背景
 @color-bi-background-default: @background-color-default;
 //深色主题默认背景
-@color-bi-background-theme-dark: #191A2C;
+@color-bi-background-default-theme-dark: @background-color-default-theme-dark;
-//普通背景
-@color-bi-background-normal: @background-color-normal;
 //黑色背景
 @color-bi-background-black: @background-color-black;
 //深灰色背景
@@ -76,6 +77,8 @@
 @color-bi-border-outline: @border-color-outline;
 //边框线颜色
 @color-bi-border-line: @border-color-line;
+//深色系边框线色
+@color-bi-border-line-theme-dark: @border-color-line-theme-dark;
 //成功边框色
 @color-bi-border-success: @border-color-success;
 //失败边框色

src/less/lib/constant.less

@@ -16,6 +16,7 @@
 
 //font color
 @font-color-normal: #1a1a1a;
+@font-color-normal-theme-dark: #b2b2b2;
 @font-color-disabled: #c4c6c6;
 @font-color-tips: #c4c6c6;
 @font-color-dark: #d4dadd;
@@ -36,7 +37,9 @@
 @background-color-black: #1a1a1a;
 @background-color-light: #eaeaea;
 @background-color-default: #ffffff;
+@background-color-default-theme-dark: #202237;
 @background-color-normal: #f3f3f3;
+@background-color-normal-theme-dark: #191A2C;
 @background-color-active: #f4f4f4;
 @background-color-highlight: #009de3;
 @background-color-dark: #d4dadd;
@@ -61,6 +64,7 @@
 @border-color-black: #1a1a1a;
 @border-color-normal: #d4dadd;
 @border-color-line: #eaeaea;
+@border-color-line-theme-dark: #24273E;
 @border-color-main: #d3d9dc;
 @border-color-outline: #009de3;
 @border-color-highlight: #178cdf;
@@ -80,6 +84,11 @@
 //scroll color
 @scroll-color: #f4f4f4;
 @scroll-thumb-color: #e2e2e2;
+@scroll-thumb-focus-color: #7d7d7d;
+
+@scroll-color-theme-dark: rgba(255,255,255,.1);
+@scroll-thumb-color-theme-dark: #7d7d7d;
+@scroll-thumb-focus-color-theme-dark: #e2e2e2;
 
 @water-mark-color: #cccccc;
 

src/less/resource/app.less

@@ -112,13 +112,13 @@ div, textarea {
   div, textarea {
     &::-webkit-scrollbar {
       -webkit-appearance: none;
-      background-color: @color-bi-background-theme-dark;
+      background-color: @scroll-color-theme-dark;
       width: 6px;
       height: 6px;
     }
     &::-webkit-scrollbar-thumb {
       .border-radius(0);
-      background-color: #7d7d7d;
+      background-color: @scroll-thumb-color-theme-dark;
     }
   }
 }

src/less/theme/dark.less

@@ -1,7 +1,7 @@
 @import "../bibase";
 
 .bi-theme-dark {
-  background-color: @color-bi-background-theme-dark;
+  background-color: @color-bi-background-normal-theme-dark;
   color: @color-bi-text-theme-dark;
   & .bi-input {
     color: @color-bi-text;

src/less/widget/multiselect/check/multiselect.check.pane.less

@@ -1,12 +1,15 @@
 @import "../../../bibase";
 
-
+.bi-multi-select-check-pane {
-.bi-multi-select-check-pane{
+  background-color: @color-bi-background-gray;
-  & .multi-select-continue-select{
+  & .multi-select-check-selected {
-    background-color: @color-bi-background-gray;
-  }
-  & .multi-select-check-selected{
     color: @color-bi-text-highlight;
     text-decoration: underline;
   }
 }
+
+.bi-theme-dark {
+  .bi-multi-select-check-pane {
+    background-color: @color-bi-background-normal-theme-dark;
+  }
+}

src/less/widget/multiselect/check/multiselect.display.less

@@ -1,8 +1,7 @@
 @import "../../../bibase";
 
-.bi-display-list{
+.bi-display-list {
-    background-color: @color-bi-background-gray;
+  & .display-list-item {
-    & .display-list-item{
+    color: @color-bi-text-gray;
-      color: @color-bi-text-gray;
+  }
-    }
 }

src/less/widget/multiselect/trigger/button.checkselected.less

@@ -10,6 +10,6 @@
 
 .bi-theme-dark {
   .bi-multi-select-check-selected-button {
-    background-color: @color-bi-background-theme-dark;
+    background-color: @color-bi-background-normal-theme-dark;
   }
 }