add

bi/base.js

@@ -29535,8 +29535,7 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
     _populateTable: function () {
         var self = this, o = this.options;
         var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
-            summaryColumnSizeArray = [], totalRowSize = o.items.length * o.rowSize;
-        var freezeColLength = this._getFreezeColLength();
+            summaryColumnSizeArray = []
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
                 totalLeftColumnSize += size;
@@ -29552,13 +29551,13 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
         });
 
         var otlw = regionSize;
-        var otlh = o.header.length * o.headerRowSize;
+        var otlh = this._getFreezeHeaderHeight();
         var otrw = this._width - regionSize;
-        var otrh = o.header.length * o.headerRowSize;
+        var otrh = this._getFreezeHeaderHeight();
         var oblw = regionSize;
-        var oblh = this._height - o.header.length * o.headerRowSize;
+        var oblh = this._height - otlh;
         var obrw = this._width - regionSize;
-        var obrh = this._height - o.header.length * o.headerRowSize;
+        var obrh = this._height - otrh;
 
         this.topLeft.setWidth(otlw);
         this.topLeft.setHeight(otlh);
@@ -29580,9 +29579,9 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
 
         var items = this.contextLayout.attr("items");
         items[1].left = regionSize;
-        items[2].top = o.header.length * o.headerRowSize;
+        items[2].top = this._getFreezeHeaderHeight();
         items[3].left = regionSize;
-        items[3].top = o.header.length * o.headerRowSize;
+        items[3].top = this._getFreezeHeaderHeight();
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
@@ -29598,8 +29597,8 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
         };
         run(this.topLeftItems, o.header, leftHeader);
         run(this.topRightItems, o.header, rightHeader);
-        run(this.bottomLeftItems, o.items, leftItems);
-        run(this.bottomRightItems, o.items, rightItems);
+        run(this.bottomLeftItems, this._getActualItems(), leftItems);
+        run(this.bottomRightItems, this._getActualItems(), rightItems);
 
         this.topLeftCollection.populate(leftHeader);
         this.topRightCollection.populate(rightHeader);
@@ -30255,7 +30254,7 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
     _populateTable: function () {
         var self = this, o = this.options;
-        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [], totalRowSize = o.items.length * o.rowSize;
+        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [];
         var freezeColLength = this._getFreezeColLength();
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@@ -30272,13 +30271,13 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
         });
 
         var otlw = regionSize;
-        var otlh = o.header.length * o.headerRowSize;
+        var otlh = this._getFreezeHeaderHeight();
         var otrw = this._width - regionSize;
-        var otrh = o.header.length * o.headerRowSize;
+        var otrh = this._getFreezeHeaderHeight();
         var oblw = regionSize;
-        var oblh = this._height - o.header.length * o.headerRowSize;
+        var oblh = this._height - otlh;
         var obrw = this._width - regionSize;
-        var obrh = this._height - o.header.length * o.headerRowSize;
+        var obrh = this._height - otrh;
 
         this.topLeft.setWidth(otlw);
         this.topLeft.setHeight(otlh);
@@ -30309,9 +30308,9 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
         var items = this.contextLayout.attr("items");
         items[1].left = regionSize;
-        items[2].top = o.header.length * o.headerRowSize;
+        items[2].top = this._getFreezeHeaderHeight();
         items[3].left = regionSize;
-        items[3].top = o.header.length * o.headerRowSize;
+        items[3].top = this._getFreezeHeaderHeight();
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
@@ -30331,7 +30330,7 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
                 }
             });
         });
-        BI.each(o.items, function (i, cols) {
+        BI.each(this._getActualItems(), function (i, cols) {
             leftItems[i] = [];
             rightItems[i] = [];
             BI.each(cols, function (j, col) {

bi/core.css

@@ -2958,12 +2958,18 @@ i {
   cursor: default !important;
   color: #cccccc !important;
 }
+.base-disabled .bi-input {
+  color: #cccccc !important;
+}
 .base-disabled .b-font:before {
   color: #cccccc !important;
 }
 .bi-theme-dark .base-disabled {
   color: #666666 !important;
 }
+.bi-theme-dark .base-disabled .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .base-disabled .b-font:before {
   color: #666666 !important;
 }
@@ -2986,27 +2992,48 @@ i {
   background-color: #eff1f4;
   color: #666666;
 }
+.bi-background .bi-input {
+  color: #666666;
+}
 .bi-theme-dark .bi-background {
   background-color: #191b2b;
   color: #cccccc;
 }
+.bi-theme-dark .bi-background .bi-input {
+  color: #cccccc;
+}
 .bi-card {
   background-color: #ffffff;
   color: #666666;
 }
+.bi-card .bi-input {
+  color: #666666;
+}
 .bi-theme-dark .bi-card {
   background-color: #242640;
   color: #cccccc;
 }
+.bi-theme-dark .bi-card .bi-input {
+  color: #cccccc;
+}
 .bi-disabled {
   color: #cccccc;
 }
+.bi-disabled .bi-input {
+  color: #cccccc;
+}
 .bi-theme-dark .bi-disabled {
   color: #666666;
 }
+.bi-theme-dark .bi-disabled .bi-input {
+  color: #666666;
+}
 .bi-tips {
   color: #999999;
 }
+.bi-tips .bi-input {
+  color: #999999;
+}
 .bi-border {
   border: 1px solid #d4dadd;
 }
@@ -3040,13 +3067,22 @@ i {
 .bi-keyword-red-mark {
   color: #f07d0a;
 }
+.bi-keyword-red-mark .bi-input {
+  color: #f07d0a;
+}
 .bi-high-light {
   color: #3f8ce8;
 }
+.bi-high-light .bi-input {
+  color: #3f8ce8;
+}
 .bi-high-light-background {
   background-color: #3f8ce8;
   color: #ffffff;
 }
+.bi-high-light-background .bi-input {
+  color: #ffffff;
+}
 .bi-high-light-border {
   border-color: #178cdf;
 }
@@ -3054,9 +3090,15 @@ i {
   color: #cccccc;
   cursor: text;
 }
+.bi-water-mark .bi-input {
+  color: #cccccc;
+}
 .bi-theme-dark .bi-water-mark {
   color: #666666;
 }
+.bi-theme-dark .bi-water-mark .bi-input {
+  color: #666666;
+}
 .bi-resizer {
   background: #1a1a1a;
   opacity: 0.2;
@@ -3071,28 +3113,46 @@ i {
   background-color: rgba(26, 26, 26, 0.2);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#331a1a1a,endColorstr=#331a1a1a);
 }
+.bi-mask .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-mask {
   color: #242640;
   background-color: rgba(255, 255, 255, 0.2);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff);
 }
+.bi-theme-dark .bi-mask .bi-input {
+  color: #242640;
+}
 .bi-z-index-mask {
   color: #ffffff;
   background-color: rgba(26, 26, 26, 0.5);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
 }
+.bi-z-index-mask .bi-input {
+  color: #ffffff;
+}
 .bi-list-item:hover,
 .bi-list-item.hover {
   color: #1a1a1a;
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item:hover .bi-input,
+.bi-list-item.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item.disabled,
 .bi-list-item.disabled:hover,
 .bi-list-item.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item.disabled .bi-input,
+.bi-list-item.disabled:hover .bi-input,
+.bi-list-item.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item.disabled .bi-high-light,
 .bi-list-item.disabled:hover .bi-high-light,
 .bi-list-item.disabled:active .bi-high-light {
@@ -3104,12 +3164,21 @@ i {
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item:hover .bi-input,
+.bi-theme-dark .bi-list-item.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item.disabled,
 .bi-theme-dark .bi-list-item.disabled:hover,
 .bi-theme-dark .bi-list-item.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item.disabled .bi-input,
+.bi-theme-dark .bi-list-item.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item.disabled:active .bi-high-light {
@@ -3122,15 +3191,27 @@ i {
 .bi-list-item-simple {
   color: #999999;
 }
+.bi-list-item-simple .bi-input {
+  color: #999999;
+}
 .bi-list-item-simple:hover,
 .bi-list-item-simple.hover {
   color: #3f8ce8;
 }
+.bi-list-item-simple:hover .bi-input,
+.bi-list-item-simple.hover .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-simple.disabled,
 .bi-list-item-simple.disabled:hover,
 .bi-list-item-simple.disabled:active {
   color: #cccccc !important;
 }
+.bi-list-item-simple.disabled .bi-input,
+.bi-list-item-simple.disabled:hover .bi-input,
+.bi-list-item-simple.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-simple.disabled .bi-high-light,
 .bi-list-item-simple.disabled:hover .bi-high-light,
 .bi-list-item-simple.disabled:active .bi-high-light {
@@ -3139,15 +3220,27 @@ i {
 .bi-list-item-effect:hover {
   color: #1a1a1a;
 }
+.bi-list-item-effect:hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-effect.active,
 .bi-list-item-effect:active {
   color: #3f8ce8;
 }
+.bi-list-item-effect.active .bi-input,
+.bi-list-item-effect:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-effect.disabled,
 .bi-list-item-effect.disabled:hover,
 .bi-list-item-effect.disabled:active {
   color: #cccccc !important;
 }
+.bi-list-item-effect.disabled .bi-input,
+.bi-list-item-effect.disabled:hover .bi-input,
+.bi-list-item-effect.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-effect.disabled .bi-high-light,
 .bi-list-item-effect.disabled:hover .bi-high-light,
 .bi-list-item-effect.disabled:active .bi-high-light {
@@ -3156,16 +3249,28 @@ i {
 .bi-theme-dark .bi-list-item-effect:hover {
   color: #ffffff;
 }
+.bi-theme-dark .bi-list-item-effect:hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-effect.active,
 .bi-theme-dark .bi-list-item-effect:active {
   color: #3f8ce8;
 }
+.bi-theme-dark .bi-list-item-effect.active .bi-input,
+.bi-theme-dark .bi-list-item-effect:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-effect.disabled,
 .bi-theme-dark .bi-list-item-effect.disabled:hover,
 .bi-theme-dark .bi-list-item-effect.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-effect.disabled .bi-input,
+.bi-theme-dark .bi-list-item-effect.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-effect.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-effect.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-effect.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-effect.disabled:active .bi-high-light {
@@ -3177,18 +3282,31 @@ i {
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-active:hover .bi-input,
+.bi-list-item-active.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-active.active,
 .bi-list-item-active:active {
   color: #3f8ce8;
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-active.active .bi-input,
+.bi-list-item-active:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-active.disabled,
 .bi-list-item-active.disabled:hover,
 .bi-list-item-active.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item-active.disabled .bi-input,
+.bi-list-item-active.disabled:hover .bi-input,
+.bi-list-item-active.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-active.disabled .bi-high-light,
 .bi-list-item-active.disabled:hover .bi-high-light,
 .bi-list-item-active.disabled:active .bi-high-light {
@@ -3200,18 +3318,31 @@ i {
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-active:hover .bi-input,
+.bi-theme-dark .bi-list-item-active.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-active.active,
 .bi-theme-dark .bi-list-item-active:active {
   color: #3f8ce8;
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-active.active .bi-input,
+.bi-theme-dark .bi-list-item-active:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-active.disabled,
 .bi-theme-dark .bi-list-item-active.disabled:hover,
 .bi-theme-dark .bi-list-item-active.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-active.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-active.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-active.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light {
@@ -3222,17 +3353,30 @@ i {
   color: #1a1a1a;
   background-color: #ffffff;
 }
+.bi-list-item-active2:hover .bi-input,
+.bi-list-item-active2.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-active2.active,
 .bi-list-item-active2:active {
   color: #3f8ce8;
   background-color: #ffffff;
 }
+.bi-list-item-active2.active .bi-input,
+.bi-list-item-active2:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
 .bi-list-item-active2.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item-active2.disabled .bi-input,
+.bi-list-item-active2.disabled:hover .bi-input,
+.bi-list-item-active2.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-active2.disabled .bi-high-light,
 .bi-list-item-active2.disabled:hover .bi-high-light,
 .bi-list-item-active2.disabled:active .bi-high-light {
@@ -3243,17 +3387,30 @@ i {
   color: #ffffff;
   background-color: #242640;
 }
+.bi-theme-dark .bi-list-item-active2:hover .bi-input,
+.bi-theme-dark .bi-list-item-active2.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-active2.active,
 .bi-theme-dark .bi-list-item-active2:active {
   color: #3f8ce8;
   background-color: #242640;
 }
+.bi-theme-dark .bi-list-item-active2.active .bi-input,
+.bi-theme-dark .bi-list-item-active2:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-active2.disabled,
 .bi-theme-dark .bi-list-item-active2.disabled:hover,
 .bi-theme-dark .bi-list-item-active2.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-active2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active2.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-active2.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-active2.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
@@ -3265,11 +3422,19 @@ i {
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-select:hover .bi-input,
+.bi-list-item-select.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-select:active,
 .bi-list-item-select.active {
   color: #ffffff;
   background-color: #3f8ce8;
 }
+.bi-list-item-select:active .bi-input,
+.bi-list-item-select.active .bi-input {
+  color: #ffffff;
+}
 .bi-list-item-select:active .bi-high-light,
 .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
@@ -3280,6 +3445,11 @@ i {
   color: #cccccc !important;
   background-color: transparent !important;
 }
+.bi-list-item-select.disabled .bi-input,
+.bi-list-item-select.disabled:hover .bi-input,
+.bi-list-item-select.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-select.disabled .bi-high-light,
 .bi-list-item-select.disabled:hover .bi-high-light,
 .bi-list-item-select.disabled:active .bi-high-light {
@@ -3291,11 +3461,19 @@ i {
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-select:hover .bi-input,
+.bi-theme-dark .bi-list-item-select.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-select:active,
 .bi-theme-dark .bi-list-item-select.active {
   color: #ffffff;
   background-color: #3f8ce8;
 }
+.bi-theme-dark .bi-list-item-select:active .bi-input,
+.bi-theme-dark .bi-list-item-select.active .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-select:active .bi-high-light,
 .bi-theme-dark .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
@@ -3306,6 +3484,11 @@ i {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-select.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {

bi/core.js

@@ -16828,7 +16828,7 @@ BI.extend(BI.DOM, {
         }
         var rgb = this.rgb2json(this.hex2rgb(hex));
         var grayLevel = Math.round(rgb.r * 0.299 + rgb.g * 0.587 + rgb.b * 0.114);
-        if (grayLevel < 140) {
+        if (grayLevel < 192/**网上给的是140**/) {
             return true;
         }
         return false;

bi/widget.js

@@ -4217,7 +4217,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + BI.first(end).x + "," + split + "L" + BI.last(end).x + "," + split;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -4238,7 +4238,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + BI.first(end).x + "," + split + "L" + BI.last(end).x + "," + split;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -4259,7 +4259,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + split + "," + BI.first(end).x + "L" + split + "," + BI.last(end).x;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -4280,7 +4280,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + split + "," + BI.first(end).x + "L" + split + "," + BI.last(end).x;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -13106,8 +13106,8 @@ BI.shortcut('bi.page_table', BI.PageTable);/**
 BI.PathChooser = BI.inherit(BI.Widget, {
 
     _const: {
-        lineColor: "#c4c6c6",
-        selectLineColor: "#009de3"
+        lineColor: "#d4dadd",
+        selectLineColor: "#3f8ce8"
     },
 
     _defaultConfig: function () {

docs/base.js

@@ -29535,8 +29535,7 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
     _populateTable: function () {
         var self = this, o = this.options;
         var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
-            summaryColumnSizeArray = [], totalRowSize = o.items.length * o.rowSize;
-        var freezeColLength = this._getFreezeColLength();
+            summaryColumnSizeArray = []
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
                 totalLeftColumnSize += size;
@@ -29552,13 +29551,13 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
         });
 
         var otlw = regionSize;
-        var otlh = o.header.length * o.headerRowSize;
+        var otlh = this._getFreezeHeaderHeight();
         var otrw = this._width - regionSize;
-        var otrh = o.header.length * o.headerRowSize;
+        var otrh = this._getFreezeHeaderHeight();
         var oblw = regionSize;
-        var oblh = this._height - o.header.length * o.headerRowSize;
+        var oblh = this._height - otlh;
         var obrw = this._width - regionSize;
-        var obrh = this._height - o.header.length * o.headerRowSize;
+        var obrh = this._height - otrh;
 
         this.topLeft.setWidth(otlw);
         this.topLeft.setHeight(otlh);
@@ -29580,9 +29579,9 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
 
         var items = this.contextLayout.attr("items");
         items[1].left = regionSize;
-        items[2].top = o.header.length * o.headerRowSize;
+        items[2].top = this._getFreezeHeaderHeight();
         items[3].left = regionSize;
-        items[3].top = o.header.length * o.headerRowSize;
+        items[3].top = this._getFreezeHeaderHeight();
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
@@ -29598,8 +29597,8 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
         };
         run(this.topLeftItems, o.header, leftHeader);
         run(this.topRightItems, o.header, rightHeader);
-        run(this.bottomLeftItems, o.items, leftItems);
-        run(this.bottomRightItems, o.items, rightItems);
+        run(this.bottomLeftItems, this._getActualItems(), leftItems);
+        run(this.bottomRightItems, this._getActualItems(), rightItems);
 
         this.topLeftCollection.populate(leftHeader);
         this.topRightCollection.populate(rightHeader);
@@ -30255,7 +30254,7 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
     _populateTable: function () {
         var self = this, o = this.options;
-        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [], totalRowSize = o.items.length * o.rowSize;
+        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [];
         var freezeColLength = this._getFreezeColLength();
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@@ -30272,13 +30271,13 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
         });
 
         var otlw = regionSize;
-        var otlh = o.header.length * o.headerRowSize;
+        var otlh = this._getFreezeHeaderHeight();
         var otrw = this._width - regionSize;
-        var otrh = o.header.length * o.headerRowSize;
+        var otrh = this._getFreezeHeaderHeight();
         var oblw = regionSize;
-        var oblh = this._height - o.header.length * o.headerRowSize;
+        var oblh = this._height - otlh;
         var obrw = this._width - regionSize;
-        var obrh = this._height - o.header.length * o.headerRowSize;
+        var obrh = this._height - otrh;
 
         this.topLeft.setWidth(otlw);
         this.topLeft.setHeight(otlh);
@@ -30309,9 +30308,9 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
         var items = this.contextLayout.attr("items");
         items[1].left = regionSize;
-        items[2].top = o.header.length * o.headerRowSize;
+        items[2].top = this._getFreezeHeaderHeight();
         items[3].left = regionSize;
-        items[3].top = o.header.length * o.headerRowSize;
+        items[3].top = this._getFreezeHeaderHeight();
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
@@ -30331,7 +30330,7 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
                 }
             });
         });
-        BI.each(o.items, function (i, cols) {
+        BI.each(this._getActualItems(), function (i, cols) {
             leftItems[i] = [];
             rightItems[i] = [];
             BI.each(cols, function (j, col) {

docs/core.css

@@ -2958,12 +2958,18 @@ i {
   cursor: default !important;
   color: #cccccc !important;
 }
+.base-disabled .bi-input {
+  color: #cccccc !important;
+}
 .base-disabled .b-font:before {
   color: #cccccc !important;
 }
 .bi-theme-dark .base-disabled {
   color: #666666 !important;
 }
+.bi-theme-dark .base-disabled .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .base-disabled .b-font:before {
   color: #666666 !important;
 }
@@ -2986,27 +2992,48 @@ i {
   background-color: #eff1f4;
   color: #666666;
 }
+.bi-background .bi-input {
+  color: #666666;
+}
 .bi-theme-dark .bi-background {
   background-color: #191b2b;
   color: #cccccc;
 }
+.bi-theme-dark .bi-background .bi-input {
+  color: #cccccc;
+}
 .bi-card {
   background-color: #ffffff;
   color: #666666;
 }
+.bi-card .bi-input {
+  color: #666666;
+}
 .bi-theme-dark .bi-card {
   background-color: #242640;
   color: #cccccc;
 }
+.bi-theme-dark .bi-card .bi-input {
+  color: #cccccc;
+}
 .bi-disabled {
   color: #cccccc;
 }
+.bi-disabled .bi-input {
+  color: #cccccc;
+}
 .bi-theme-dark .bi-disabled {
   color: #666666;
 }
+.bi-theme-dark .bi-disabled .bi-input {
+  color: #666666;
+}
 .bi-tips {
   color: #999999;
 }
+.bi-tips .bi-input {
+  color: #999999;
+}
 .bi-border {
   border: 1px solid #d4dadd;
 }
@@ -3040,13 +3067,22 @@ i {
 .bi-keyword-red-mark {
   color: #f07d0a;
 }
+.bi-keyword-red-mark .bi-input {
+  color: #f07d0a;
+}
 .bi-high-light {
   color: #3f8ce8;
 }
+.bi-high-light .bi-input {
+  color: #3f8ce8;
+}
 .bi-high-light-background {
   background-color: #3f8ce8;
   color: #ffffff;
 }
+.bi-high-light-background .bi-input {
+  color: #ffffff;
+}
 .bi-high-light-border {
   border-color: #178cdf;
 }
@@ -3054,9 +3090,15 @@ i {
   color: #cccccc;
   cursor: text;
 }
+.bi-water-mark .bi-input {
+  color: #cccccc;
+}
 .bi-theme-dark .bi-water-mark {
   color: #666666;
 }
+.bi-theme-dark .bi-water-mark .bi-input {
+  color: #666666;
+}
 .bi-resizer {
   background: #1a1a1a;
   opacity: 0.2;
@@ -3071,28 +3113,46 @@ i {
   background-color: rgba(26, 26, 26, 0.2);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#331a1a1a,endColorstr=#331a1a1a);
 }
+.bi-mask .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-mask {
   color: #242640;
   background-color: rgba(255, 255, 255, 0.2);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff);
 }
+.bi-theme-dark .bi-mask .bi-input {
+  color: #242640;
+}
 .bi-z-index-mask {
   color: #ffffff;
   background-color: rgba(26, 26, 26, 0.5);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
 }
+.bi-z-index-mask .bi-input {
+  color: #ffffff;
+}
 .bi-list-item:hover,
 .bi-list-item.hover {
   color: #1a1a1a;
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item:hover .bi-input,
+.bi-list-item.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item.disabled,
 .bi-list-item.disabled:hover,
 .bi-list-item.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item.disabled .bi-input,
+.bi-list-item.disabled:hover .bi-input,
+.bi-list-item.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item.disabled .bi-high-light,
 .bi-list-item.disabled:hover .bi-high-light,
 .bi-list-item.disabled:active .bi-high-light {
@@ -3104,12 +3164,21 @@ i {
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item:hover .bi-input,
+.bi-theme-dark .bi-list-item.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item.disabled,
 .bi-theme-dark .bi-list-item.disabled:hover,
 .bi-theme-dark .bi-list-item.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item.disabled .bi-input,
+.bi-theme-dark .bi-list-item.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item.disabled:active .bi-high-light {
@@ -3122,15 +3191,27 @@ i {
 .bi-list-item-simple {
   color: #999999;
 }
+.bi-list-item-simple .bi-input {
+  color: #999999;
+}
 .bi-list-item-simple:hover,
 .bi-list-item-simple.hover {
   color: #3f8ce8;
 }
+.bi-list-item-simple:hover .bi-input,
+.bi-list-item-simple.hover .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-simple.disabled,
 .bi-list-item-simple.disabled:hover,
 .bi-list-item-simple.disabled:active {
   color: #cccccc !important;
 }
+.bi-list-item-simple.disabled .bi-input,
+.bi-list-item-simple.disabled:hover .bi-input,
+.bi-list-item-simple.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-simple.disabled .bi-high-light,
 .bi-list-item-simple.disabled:hover .bi-high-light,
 .bi-list-item-simple.disabled:active .bi-high-light {
@@ -3139,15 +3220,27 @@ i {
 .bi-list-item-effect:hover {
   color: #1a1a1a;
 }
+.bi-list-item-effect:hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-effect.active,
 .bi-list-item-effect:active {
   color: #3f8ce8;
 }
+.bi-list-item-effect.active .bi-input,
+.bi-list-item-effect:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-effect.disabled,
 .bi-list-item-effect.disabled:hover,
 .bi-list-item-effect.disabled:active {
   color: #cccccc !important;
 }
+.bi-list-item-effect.disabled .bi-input,
+.bi-list-item-effect.disabled:hover .bi-input,
+.bi-list-item-effect.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-effect.disabled .bi-high-light,
 .bi-list-item-effect.disabled:hover .bi-high-light,
 .bi-list-item-effect.disabled:active .bi-high-light {
@@ -3156,16 +3249,28 @@ i {
 .bi-theme-dark .bi-list-item-effect:hover {
   color: #ffffff;
 }
+.bi-theme-dark .bi-list-item-effect:hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-effect.active,
 .bi-theme-dark .bi-list-item-effect:active {
   color: #3f8ce8;
 }
+.bi-theme-dark .bi-list-item-effect.active .bi-input,
+.bi-theme-dark .bi-list-item-effect:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-effect.disabled,
 .bi-theme-dark .bi-list-item-effect.disabled:hover,
 .bi-theme-dark .bi-list-item-effect.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-effect.disabled .bi-input,
+.bi-theme-dark .bi-list-item-effect.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-effect.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-effect.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-effect.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-effect.disabled:active .bi-high-light {
@@ -3177,18 +3282,31 @@ i {
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-active:hover .bi-input,
+.bi-list-item-active.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-active.active,
 .bi-list-item-active:active {
   color: #3f8ce8;
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-active.active .bi-input,
+.bi-list-item-active:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-active.disabled,
 .bi-list-item-active.disabled:hover,
 .bi-list-item-active.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item-active.disabled .bi-input,
+.bi-list-item-active.disabled:hover .bi-input,
+.bi-list-item-active.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-active.disabled .bi-high-light,
 .bi-list-item-active.disabled:hover .bi-high-light,
 .bi-list-item-active.disabled:active .bi-high-light {
@@ -3200,18 +3318,31 @@ i {
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-active:hover .bi-input,
+.bi-theme-dark .bi-list-item-active.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-active.active,
 .bi-theme-dark .bi-list-item-active:active {
   color: #3f8ce8;
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-active.active .bi-input,
+.bi-theme-dark .bi-list-item-active:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-active.disabled,
 .bi-theme-dark .bi-list-item-active.disabled:hover,
 .bi-theme-dark .bi-list-item-active.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-active.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-active.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-active.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light {
@@ -3222,17 +3353,30 @@ i {
   color: #1a1a1a;
   background-color: #ffffff;
 }
+.bi-list-item-active2:hover .bi-input,
+.bi-list-item-active2.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-active2.active,
 .bi-list-item-active2:active {
   color: #3f8ce8;
   background-color: #ffffff;
 }
+.bi-list-item-active2.active .bi-input,
+.bi-list-item-active2:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
 .bi-list-item-active2.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item-active2.disabled .bi-input,
+.bi-list-item-active2.disabled:hover .bi-input,
+.bi-list-item-active2.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-active2.disabled .bi-high-light,
 .bi-list-item-active2.disabled:hover .bi-high-light,
 .bi-list-item-active2.disabled:active .bi-high-light {
@@ -3243,17 +3387,30 @@ i {
   color: #ffffff;
   background-color: #242640;
 }
+.bi-theme-dark .bi-list-item-active2:hover .bi-input,
+.bi-theme-dark .bi-list-item-active2.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-active2.active,
 .bi-theme-dark .bi-list-item-active2:active {
   color: #3f8ce8;
   background-color: #242640;
 }
+.bi-theme-dark .bi-list-item-active2.active .bi-input,
+.bi-theme-dark .bi-list-item-active2:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-active2.disabled,
 .bi-theme-dark .bi-list-item-active2.disabled:hover,
 .bi-theme-dark .bi-list-item-active2.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-active2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active2.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-active2.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-active2.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
@@ -3265,11 +3422,19 @@ i {
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-select:hover .bi-input,
+.bi-list-item-select.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-select:active,
 .bi-list-item-select.active {
   color: #ffffff;
   background-color: #3f8ce8;
 }
+.bi-list-item-select:active .bi-input,
+.bi-list-item-select.active .bi-input {
+  color: #ffffff;
+}
 .bi-list-item-select:active .bi-high-light,
 .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
@@ -3280,6 +3445,11 @@ i {
   color: #cccccc !important;
   background-color: transparent !important;
 }
+.bi-list-item-select.disabled .bi-input,
+.bi-list-item-select.disabled:hover .bi-input,
+.bi-list-item-select.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-select.disabled .bi-high-light,
 .bi-list-item-select.disabled:hover .bi-high-light,
 .bi-list-item-select.disabled:active .bi-high-light {
@@ -3291,11 +3461,19 @@ i {
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-select:hover .bi-input,
+.bi-theme-dark .bi-list-item-select.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-select:active,
 .bi-theme-dark .bi-list-item-select.active {
   color: #ffffff;
   background-color: #3f8ce8;
 }
+.bi-theme-dark .bi-list-item-select:active .bi-input,
+.bi-theme-dark .bi-list-item-select.active .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-select:active .bi-high-light,
 .bi-theme-dark .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
@@ -3306,6 +3484,11 @@ i {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-select.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {

docs/core.js

@@ -22846,7 +22846,7 @@ BI.extend(BI.DOM, {
         }
         var rgb = this.rgb2json(this.hex2rgb(hex));
         var grayLevel = Math.round(rgb.r * 0.299 + rgb.g * 0.587 + rgb.b * 0.114);
-        if (grayLevel < 140) {
+        if (grayLevel < 192/**网上给的是140**/) {
             return true;
         }
         return false;

docs/widget.js

@@ -4217,7 +4217,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + BI.first(end).x + "," + split + "L" + BI.last(end).x + "," + split;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -4238,7 +4238,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + BI.first(end).x + "," + split + "L" + BI.last(end).x + "," + split;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -4259,7 +4259,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + split + "," + BI.first(end).x + "L" + split + "," + BI.last(end).x;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -4280,7 +4280,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + split + "," + BI.first(end).x + "L" + split + "," + BI.last(end).x;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -13106,8 +13106,8 @@ BI.shortcut('bi.page_table', BI.PageTable);/**
 BI.PathChooser = BI.inherit(BI.Widget, {
 
     _const: {
-        lineColor: "#c4c6c6",
-        selectLineColor: "#009de3"
+        lineColor: "#d4dadd",
+        selectLineColor: "#3f8ce8"
     },
 
     _defaultConfig: function () {

src/base/table/table.collection.quick.js

@@ -117,8 +117,7 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
     _populateTable: function () {
         var self = this, o = this.options;
         var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
-            summaryColumnSizeArray = [], totalRowSize = o.items.length * o.rowSize;
-        var freezeColLength = this._getFreezeColLength();
+            summaryColumnSizeArray = []
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
                 totalLeftColumnSize += size;
@@ -134,13 +133,13 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
         });
 
         var otlw = regionSize;
-        var otlh = o.header.length * o.headerRowSize;
+        var otlh = this._getFreezeHeaderHeight();
         var otrw = this._width - regionSize;
-        var otrh = o.header.length * o.headerRowSize;
+        var otrh = this._getFreezeHeaderHeight();
         var oblw = regionSize;
-        var oblh = this._height - o.header.length * o.headerRowSize;
+        var oblh = this._height - otlh;
         var obrw = this._width - regionSize;
-        var obrh = this._height - o.header.length * o.headerRowSize;
+        var obrh = this._height - otrh;
 
         this.topLeft.setWidth(otlw);
         this.topLeft.setHeight(otlh);
@@ -162,9 +161,9 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
 
         var items = this.contextLayout.attr("items");
         items[1].left = regionSize;
-        items[2].top = o.header.length * o.headerRowSize;
+        items[2].top = this._getFreezeHeaderHeight();
         items[3].left = regionSize;
-        items[3].top = o.header.length * o.headerRowSize;
+        items[3].top = this._getFreezeHeaderHeight();
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
@@ -180,8 +179,8 @@ BI.QuickCollectionTable = BI.inherit(BI.CollectionTable, {
         };
         run(this.topLeftItems, o.header, leftHeader);
         run(this.topRightItems, o.header, rightHeader);
-        run(this.bottomLeftItems, o.items, leftItems);
-        run(this.bottomRightItems, o.items, rightItems);
+        run(this.bottomLeftItems, this._getActualItems(), leftItems);
+        run(this.bottomRightItems, this._getActualItems(), rightItems);
 
         this.topLeftCollection.populate(leftHeader);
         this.topRightCollection.populate(rightHeader);

src/base/table/table.grid.quick.js

@@ -116,7 +116,7 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
     _populateTable: function () {
         var self = this, o = this.options;
-        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [], totalRowSize = o.items.length * o.rowSize;
+        var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = [];
         var freezeColLength = this._getFreezeColLength();
         BI.each(o.columnSize, function (i, size) {
             if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@@ -133,13 +133,13 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
         });
 
         var otlw = regionSize;
-        var otlh = o.header.length * o.headerRowSize;
+        var otlh = this._getFreezeHeaderHeight();
         var otrw = this._width - regionSize;
-        var otrh = o.header.length * o.headerRowSize;
+        var otrh = this._getFreezeHeaderHeight();
         var oblw = regionSize;
-        var oblh = this._height - o.header.length * o.headerRowSize;
+        var oblh = this._height - otlh;
         var obrw = this._width - regionSize;
-        var obrh = this._height - o.header.length * o.headerRowSize;
+        var obrh = this._height - otrh;
 
         this.topLeft.setWidth(otlw);
         this.topLeft.setHeight(otlh);
@@ -170,9 +170,9 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
 
         var items = this.contextLayout.attr("items");
         items[1].left = regionSize;
-        items[2].top = o.header.length * o.headerRowSize;
+        items[2].top = this._getFreezeHeaderHeight();
         items[3].left = regionSize;
-        items[3].top = o.header.length * o.headerRowSize;
+        items[3].top = this._getFreezeHeaderHeight();
         this.contextLayout.attr("items", items);
         this.contextLayout.resize();
 
@@ -192,7 +192,7 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
                 }
             });
         });
-        BI.each(o.items, function (i, cols) {
+        BI.each(this._getActualItems(), function (i, cols) {
             leftItems[i] = [];
             rightItems[i] = [];
             BI.each(cols, function (j, col) {

src/core/func/function.js

@@ -127,7 +127,7 @@ BI.extend(BI.DOM, {
         }
         var rgb = this.rgb2json(this.hex2rgb(hex));
         var grayLevel = Math.round(rgb.r * 0.299 + rgb.g * 0.587 + rgb.b * 0.114);
-        if (grayLevel < 140) {
+        if (grayLevel < 192/**网上给的是140**/) {
             return true;
         }
         return false;

src/css/core/utils/common.css

@@ -5,12 +5,18 @@
   cursor: default !important;
   color: #cccccc !important;
 }
+.base-disabled .bi-input {
+  color: #cccccc !important;
+}
 .base-disabled .b-font:before {
   color: #cccccc !important;
 }
 .bi-theme-dark .base-disabled {
   color: #666666 !important;
 }
+.bi-theme-dark .base-disabled .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .base-disabled .b-font:before {
   color: #666666 !important;
 }
@@ -33,27 +39,48 @@
   background-color: #eff1f4;
   color: #666666;
 }
+.bi-background .bi-input {
+  color: #666666;
+}
 .bi-theme-dark .bi-background {
   background-color: #191b2b;
   color: #cccccc;
 }
+.bi-theme-dark .bi-background .bi-input {
+  color: #cccccc;
+}
 .bi-card {
   background-color: #ffffff;
   color: #666666;
 }
+.bi-card .bi-input {
+  color: #666666;
+}
 .bi-theme-dark .bi-card {
   background-color: #242640;
   color: #cccccc;
 }
+.bi-theme-dark .bi-card .bi-input {
+  color: #cccccc;
+}
 .bi-disabled {
   color: #cccccc;
 }
+.bi-disabled .bi-input {
+  color: #cccccc;
+}
 .bi-theme-dark .bi-disabled {
   color: #666666;
 }
+.bi-theme-dark .bi-disabled .bi-input {
+  color: #666666;
+}
 .bi-tips {
   color: #999999;
 }
+.bi-tips .bi-input {
+  color: #999999;
+}
 .bi-border {
   border: 1px solid #d4dadd;
 }
@@ -87,13 +114,22 @@
 .bi-keyword-red-mark {
   color: #f07d0a;
 }
+.bi-keyword-red-mark .bi-input {
+  color: #f07d0a;
+}
 .bi-high-light {
   color: #3f8ce8;
 }
+.bi-high-light .bi-input {
+  color: #3f8ce8;
+}
 .bi-high-light-background {
   background-color: #3f8ce8;
   color: #ffffff;
 }
+.bi-high-light-background .bi-input {
+  color: #ffffff;
+}
 .bi-high-light-border {
   border-color: #178cdf;
 }
@@ -101,9 +137,15 @@
   color: #cccccc;
   cursor: text;
 }
+.bi-water-mark .bi-input {
+  color: #cccccc;
+}
 .bi-theme-dark .bi-water-mark {
   color: #666666;
 }
+.bi-theme-dark .bi-water-mark .bi-input {
+  color: #666666;
+}
 .bi-resizer {
   background: #1a1a1a;
   opacity: 0.2;
@@ -118,28 +160,46 @@
   background-color: rgba(26, 26, 26, 0.2);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#331a1a1a,endColorstr=#331a1a1a);
 }
+.bi-mask .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-mask {
   color: #242640;
   background-color: rgba(255, 255, 255, 0.2);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff);
 }
+.bi-theme-dark .bi-mask .bi-input {
+  color: #242640;
+}
 .bi-z-index-mask {
   color: #ffffff;
   background-color: rgba(26, 26, 26, 0.5);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
 }
+.bi-z-index-mask .bi-input {
+  color: #ffffff;
+}
 .bi-list-item:hover,
 .bi-list-item.hover {
   color: #1a1a1a;
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item:hover .bi-input,
+.bi-list-item.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item.disabled,
 .bi-list-item.disabled:hover,
 .bi-list-item.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item.disabled .bi-input,
+.bi-list-item.disabled:hover .bi-input,
+.bi-list-item.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item.disabled .bi-high-light,
 .bi-list-item.disabled:hover .bi-high-light,
 .bi-list-item.disabled:active .bi-high-light {
@@ -151,12 +211,21 @@
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item:hover .bi-input,
+.bi-theme-dark .bi-list-item.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item.disabled,
 .bi-theme-dark .bi-list-item.disabled:hover,
 .bi-theme-dark .bi-list-item.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item.disabled .bi-input,
+.bi-theme-dark .bi-list-item.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item.disabled:active .bi-high-light {
@@ -169,15 +238,27 @@
 .bi-list-item-simple {
   color: #999999;
 }
+.bi-list-item-simple .bi-input {
+  color: #999999;
+}
 .bi-list-item-simple:hover,
 .bi-list-item-simple.hover {
   color: #3f8ce8;
 }
+.bi-list-item-simple:hover .bi-input,
+.bi-list-item-simple.hover .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-simple.disabled,
 .bi-list-item-simple.disabled:hover,
 .bi-list-item-simple.disabled:active {
   color: #cccccc !important;
 }
+.bi-list-item-simple.disabled .bi-input,
+.bi-list-item-simple.disabled:hover .bi-input,
+.bi-list-item-simple.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-simple.disabled .bi-high-light,
 .bi-list-item-simple.disabled:hover .bi-high-light,
 .bi-list-item-simple.disabled:active .bi-high-light {
@@ -186,15 +267,27 @@
 .bi-list-item-effect:hover {
   color: #1a1a1a;
 }
+.bi-list-item-effect:hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-effect.active,
 .bi-list-item-effect:active {
   color: #3f8ce8;
 }
+.bi-list-item-effect.active .bi-input,
+.bi-list-item-effect:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-effect.disabled,
 .bi-list-item-effect.disabled:hover,
 .bi-list-item-effect.disabled:active {
   color: #cccccc !important;
 }
+.bi-list-item-effect.disabled .bi-input,
+.bi-list-item-effect.disabled:hover .bi-input,
+.bi-list-item-effect.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-effect.disabled .bi-high-light,
 .bi-list-item-effect.disabled:hover .bi-high-light,
 .bi-list-item-effect.disabled:active .bi-high-light {
@@ -203,16 +296,28 @@
 .bi-theme-dark .bi-list-item-effect:hover {
   color: #ffffff;
 }
+.bi-theme-dark .bi-list-item-effect:hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-effect.active,
 .bi-theme-dark .bi-list-item-effect:active {
   color: #3f8ce8;
 }
+.bi-theme-dark .bi-list-item-effect.active .bi-input,
+.bi-theme-dark .bi-list-item-effect:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-effect.disabled,
 .bi-theme-dark .bi-list-item-effect.disabled:hover,
 .bi-theme-dark .bi-list-item-effect.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-effect.disabled .bi-input,
+.bi-theme-dark .bi-list-item-effect.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-effect.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-effect.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-effect.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-effect.disabled:active .bi-high-light {
@@ -224,18 +329,31 @@
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-active:hover .bi-input,
+.bi-list-item-active.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-active.active,
 .bi-list-item-active:active {
   color: #3f8ce8;
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-active.active .bi-input,
+.bi-list-item-active:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-active.disabled,
 .bi-list-item-active.disabled:hover,
 .bi-list-item-active.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item-active.disabled .bi-input,
+.bi-list-item-active.disabled:hover .bi-input,
+.bi-list-item-active.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-active.disabled .bi-high-light,
 .bi-list-item-active.disabled:hover .bi-high-light,
 .bi-list-item-active.disabled:active .bi-high-light {
@@ -247,18 +365,31 @@
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-active:hover .bi-input,
+.bi-theme-dark .bi-list-item-active.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-active.active,
 .bi-theme-dark .bi-list-item-active:active {
   color: #3f8ce8;
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-active.active .bi-input,
+.bi-theme-dark .bi-list-item-active:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-active.disabled,
 .bi-theme-dark .bi-list-item-active.disabled:hover,
 .bi-theme-dark .bi-list-item-active.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-active.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-active.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-active.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light {
@@ -269,17 +400,30 @@
   color: #1a1a1a;
   background-color: #ffffff;
 }
+.bi-list-item-active2:hover .bi-input,
+.bi-list-item-active2.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-active2.active,
 .bi-list-item-active2:active {
   color: #3f8ce8;
   background-color: #ffffff;
 }
+.bi-list-item-active2.active .bi-input,
+.bi-list-item-active2:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-list-item-active2.disabled,
 .bi-list-item-active2.disabled:hover,
 .bi-list-item-active2.disabled:active {
   background-color: transparent !important;
   color: #cccccc !important;
 }
+.bi-list-item-active2.disabled .bi-input,
+.bi-list-item-active2.disabled:hover .bi-input,
+.bi-list-item-active2.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-active2.disabled .bi-high-light,
 .bi-list-item-active2.disabled:hover .bi-high-light,
 .bi-list-item-active2.disabled:active .bi-high-light {
@@ -290,17 +434,30 @@
   color: #ffffff;
   background-color: #242640;
 }
+.bi-theme-dark .bi-list-item-active2:hover .bi-input,
+.bi-theme-dark .bi-list-item-active2.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-active2.active,
 .bi-theme-dark .bi-list-item-active2:active {
   color: #3f8ce8;
   background-color: #242640;
 }
+.bi-theme-dark .bi-list-item-active2.active .bi-input,
+.bi-theme-dark .bi-list-item-active2:active .bi-input {
+  color: #3f8ce8;
+}
 .bi-theme-dark .bi-list-item-active2.disabled,
 .bi-theme-dark .bi-list-item-active2.disabled:hover,
 .bi-theme-dark .bi-list-item-active2.disabled:active {
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-active2.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active2.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active2.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-active2.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-active2.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
@@ -312,11 +469,19 @@
   background-color: rgba(26, 26, 26, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d1a1a1a,endColorstr=#0d1a1a1a);
 }
+.bi-list-item-select:hover .bi-input,
+.bi-list-item-select.hover .bi-input {
+  color: #1a1a1a;
+}
 .bi-list-item-select:active,
 .bi-list-item-select.active {
   color: #ffffff;
   background-color: #3f8ce8;
 }
+.bi-list-item-select:active .bi-input,
+.bi-list-item-select.active .bi-input {
+  color: #ffffff;
+}
 .bi-list-item-select:active .bi-high-light,
 .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
@@ -327,6 +492,11 @@
   color: #cccccc !important;
   background-color: transparent !important;
 }
+.bi-list-item-select.disabled .bi-input,
+.bi-list-item-select.disabled:hover .bi-input,
+.bi-list-item-select.disabled:active .bi-input {
+  color: #cccccc !important;
+}
 .bi-list-item-select.disabled .bi-high-light,
 .bi-list-item-select.disabled:hover .bi-high-light,
 .bi-list-item-select.disabled:active .bi-high-light {
@@ -338,11 +508,19 @@
   background-color: rgba(255, 255, 255, 0.05);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dffffff,endColorstr=#0dffffff);
 }
+.bi-theme-dark .bi-list-item-select:hover .bi-input,
+.bi-theme-dark .bi-list-item-select.hover .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-select:active,
 .bi-theme-dark .bi-list-item-select.active {
   color: #ffffff;
   background-color: #3f8ce8;
 }
+.bi-theme-dark .bi-list-item-select:active .bi-input,
+.bi-theme-dark .bi-list-item-select.active .bi-input {
+  color: #ffffff;
+}
 .bi-theme-dark .bi-list-item-select:active .bi-high-light,
 .bi-theme-dark .bi-list-item-select.active .bi-high-light {
   color: #ffffff;
@@ -353,6 +531,11 @@
   background-color: transparent !important;
   color: #666666 !important;
 }
+.bi-theme-dark .bi-list-item-select.disabled .bi-input,
+.bi-theme-dark .bi-list-item-select.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-select.disabled:active .bi-input {
+  color: #666666 !important;
+}
 .bi-theme-dark .bi-list-item-select.disabled .bi-high-light,
 .bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light,
 .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {

src/less/core/utils/common.less

@@ -3,6 +3,9 @@
 .base-disabled {
   cursor: default !important;
   color: @color-bi-text-disabled !important;
+  & .bi-input {
+    color: @color-bi-text-disabled !important;
+  }
   & .b-font:before {
     color: @color-bi-text-disabled !important;
   }
@@ -11,6 +14,9 @@
 .bi-theme-dark {
   .base-disabled {
     color: @color-bi-text-disabled-theme-dark !important;
+    & .bi-input {
+      color: @color-bi-text-disabled-theme-dark !important;
+    }
     & .b-font:before {
       color: @color-bi-text-disabled-theme-dark !important;
     }
@@ -29,12 +35,18 @@
 .bi-background {
   background-color: @color-bi-background-normal;
   color: @color-bi-text-normal;
+  & .bi-input {
+    color: @color-bi-text-normal;
+  }
 }
 
 .bi-theme-dark {
   .bi-background {
     background-color: @color-bi-background-normal-theme-dark;
     color: @color-bi-text-theme-dark;
+    & .bi-input {
+      color: @color-bi-text-theme-dark;
+    }
   }
 }
 
@@ -42,28 +54,43 @@
 .bi-card {
   background-color: @color-bi-background-default;
   color: @color-bi-text-normal;
+  & .bi-input {
+    color: @color-bi-text-normal;
+  }
 }
 
 .bi-theme-dark {
   .bi-card {
     background-color: @color-bi-background-default-theme-dark;
     color: @color-bi-text-theme-dark;
+    & .bi-input {
+      color: @color-bi-text-theme-dark;
+    }
   }
 }
 
 .bi-disabled {
   color: @color-bi-text-disabled;
+  & .bi-input {
+    color: @color-bi-text-disabled;
+  }
 }
 
 .bi-theme-dark {
   .bi-disabled {
     color: @color-bi-text-disabled-theme-dark;
+    & .bi-input {
+      color: @color-bi-text-disabled-theme-dark;
+    }
   }
 }
 
 //提示区域, 灰色字体
 .bi-tips {
   color: @color-bi-text-tips;
+  & .bi-input {
+    color: @color-bi-text-tips;
+  }
 }
 
 //边框
@@ -120,16 +147,25 @@
 //标红
 .bi-keyword-red-mark {
   color: @color-bi-text-redmark;
+  & .bi-input {
+    color: @color-bi-text-redmark;
+  }
 }
 
 //高亮
 .bi-high-light {
   color: @color-bi-text-highlight;
+  & .bi-input {
+    color: @color-bi-text-highlight;
+  }
 }
 
 .bi-high-light-background {
   background-color: @color-bi-background-highlight;
   color: @color-bi-text;
+  & .bi-input {
+    color: @color-bi-text;
+  }
 }
 
 .bi-high-light-border {
@@ -140,11 +176,17 @@
 .bi-water-mark {
   color: @water-mark-color;
   cursor: text;
+  & .bi-input {
+    color: @water-mark-color;
+  }
 }
 
 .bi-theme-dark {
   .bi-water-mark {
     color: @water-mark-color-theme-dark;
+    & .bi-input {
+      color: @water-mark-color-theme-dark;
+    }
   }
 }
 
@@ -163,18 +205,27 @@
 
 .bi-mask {
   color: @color-bi-background-default;
+  & .bi-input {
+    color: @color-bi-background-default;
+  }
   .background-color(@color-bi-background-black, 20%);
 }
 
 .bi-theme-dark {
   .bi-mask {
     color: @color-bi-background-default-theme-dark;
+    & .bi-input {
+      color: @color-bi-background-default-theme-dark;
+    }
     .background-color(@color-bi-background-default, 20%);
   }
 }
 
 .bi-z-index-mask {
   color: @color-bi-background-default;
+  & .bi-input {
+    color: @color-bi-background-default;
+  }
   .background-color(@color-bi-background-black, 50%);
 }
 
@@ -182,12 +233,18 @@
 .bi-list-item {
   &:hover, &.hover {
     color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
     .background-color(@color-bi-background-black, 5%);
   }
   &.disabled {
     &, &:hover, &:active {
       background-color: transparent !important;
       color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
@@ -199,12 +256,18 @@
   .bi-list-item {
     &:hover, &.hover {
       color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
       .background-color(@color-bi-background-default, 5%);
     }
     &.disabled {
       &, &:hover, &:active {
         background-color: transparent !important;
         color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
         & .bi-high-light {
           color: @color-bi-text-disabled-theme-dark !important;
         }
@@ -222,12 +285,21 @@
 //极简
 .bi-list-item-simple {
   color: @color-bi-text-tips;
+  & .bi-input {
+    color: @color-bi-text-tips;
+  }
   &:hover, &.hover {
     color: @color-bi-text-highlight;
+    & .bi-input {
+      color: @color-bi-text-highlight;
+    }
   }
   &.disabled {
     &, &:hover, &:active {
       color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
@@ -239,13 +311,22 @@
 .bi-list-item-effect {
   &:hover {
     color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
   }
   &.active, &:active {
     color: @color-bi-text-highlight;
+    & .bi-input {
+      color: @color-bi-text-highlight;
+    }
   }
   &.disabled {
     &, &:hover, &:active {
       color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
@@ -257,14 +338,23 @@
   .bi-list-item-effect {
     &:hover {
       color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
     }
     &.active, &:active {
       color: @color-bi-text-highlight;
+      & .bi-input {
+        color: @color-bi-text-highlight;
+      }
     }
     &.disabled {
       &, &:hover, &:active {
         background-color: transparent !important;
         color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
         & .bi-high-light {
           color: @color-bi-text-disabled-theme-dark !important;
         }
@@ -277,16 +367,25 @@
 .bi-list-item-active {
   &:hover, &.hover {
     color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
     .background-color(@color-bi-background-black, 5%);
   }
   &.active, &:active {
     color: @color-bi-text-highlight;
+    & .bi-input {
+      color: @color-bi-text-highlight;
+    }
     .background-color(@color-bi-background-black, 5%);
   }
   &.disabled {
     &, &:hover, &:active {
       background-color: transparent !important;
       color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
@@ -298,16 +397,25 @@
   .bi-list-item-active {
     &:hover, &.hover {
       color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
       .background-color(@color-bi-background-default, 5%);
     }
     &.active, &:active {
       color: @color-bi-text-highlight;
+      & .bi-input {
+        color: @color-bi-text-highlight;
+      }
       .background-color(@color-bi-background-default, 5%);
     }
     &.disabled {
       &, &:hover, &:active {
         background-color: transparent !important;
         color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
         & .bi-high-light {
           color: @color-bi-text-disabled-theme-dark !important;
         }
@@ -320,16 +428,25 @@
 .bi-list-item-active2 {
   &:hover, &.hover {
     color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
     background-color: @color-bi-background-default;
   }
   &.active, &:active {
     color: @color-bi-text-highlight;
+    & .bi-input {
+      color: @color-bi-text-highlight;
+    }
     background-color: @color-bi-background-default;
   }
   &.disabled {
     &, &:hover, &:active {
       background-color: transparent !important;
       color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
@@ -341,16 +458,25 @@
   .bi-list-item-active2 {
     &:hover, &.hover {
       color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
       background-color: @color-bi-background-default-theme-dark;
     }
     &.active, &:active {
       color: @color-bi-text-highlight;
+      & .bi-input {
+        color: @color-bi-text-highlight;
+      }
       background-color: @color-bi-background-default-theme-dark;
     }
     &.disabled {
       &, &:hover, &:active {
         background-color: transparent !important;
         color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
         & .bi-high-light {
           color: @color-bi-text-disabled-theme-dark !important;
         }
@@ -363,10 +489,16 @@
 .bi-list-item-select {
   &:hover, &.hover {
     color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
     .background-color(@color-bi-background-black, 5%);
   }
   &:active, &.active {
     color: @color-bi-text;
+    & .bi-input {
+      color: @color-bi-text;
+    }
     background-color: @color-bi-background-highlight;
     & .bi-high-light {
       color: @color-bi-text;
@@ -375,6 +507,9 @@
   &.disabled {
     &, &:hover, &:active {
       color: @color-bi-text-disabled !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
       background-color: transparent !important;
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
@@ -387,10 +522,16 @@
   .bi-list-item-select {
     &:hover, &.hover {
       color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
       .background-color(@color-bi-background-default, 5%);
     }
     &:active, &.active {
       color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
       background-color: @color-bi-background-highlight;
       & .bi-high-light {
         color: @color-bi-text;
@@ -400,6 +541,9 @@
       &, &:hover, &:active {
         background-color: transparent !important;
         color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
         & .bi-high-light {
           color: @color-bi-text-disabled-theme-dark !important;
         }

src/less/lib/colors.less

@@ -17,7 +17,7 @@
 @color-bi-text: @font-color-white;
 //灰化字体颜色
 @color-bi-text-disabled: @font-color-disabled;
-//神色主题灰化字体颜色
+//深色主题灰化字体颜色
 @color-bi-text-disabled-theme-dark: @font-color-disabled-theme-dark;
 //提示字体颜色
 @color-bi-text-tips: @font-color-tips;
@@ -41,6 +41,8 @@
 @color-bi-background-black: @background-color-black;
 //深灰色背景
 @color-bi-background-dark: @background-color-dark;
+//灰色背景
+@color-bi-background-gray: @background-color-gray;
 //灰化背景
 @color-bi-background-disabled: @background-color-disabled;
 //成功背景色

src/less/lib/constant.less

@@ -38,6 +38,7 @@
 @background-color-normal-theme-dark: #191B2B;//
 @background-color-highlight: #3f8ce8;
 @background-color-dark: #d4dadd;
+@background-color-gray: #999999;
 @background-color-disabled: #cccccc;
 
 @background-color-orange: #fef6de;

src/widget/branchrelation/branchrelation.js

@@ -284,7 +284,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + BI.first(end).x + "," + split + "L" + BI.last(end).x + "," + split;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -305,7 +305,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + BI.first(end).x + "," + split + "L" + BI.last(end).x + "," + split;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -326,7 +326,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + split + "," + BI.first(end).x + "L" + split + "," + BI.last(end).x;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });
@@ -347,7 +347,7 @@ BI.BranchRelation = BI.inherit(BI.Widget, {
                             if (end.length > 0) {
                                 path += "M" + split + "," + BI.first(end).x + "L" + split + "," + BI.last(end).x;
                             }
-                            self.svg.path(path).attr("stroke", "gray");
+                            self.svg.path(path).attr("stroke", "#d4dadd");
                         }
                     })
                 });

src/widget/pathchooser/pathchooser.js

@@ -8,8 +8,8 @@
 BI.PathChooser = BI.inherit(BI.Widget, {
 
     _const: {
-        lineColor: "#c4c6c6",
-        selectLineColor: "#009de3"
+        lineColor: "#d4dadd",
+        selectLineColor: "#3f8ce8"
     },
 
     _defaultConfig: function () {