').css({
position: 'absolute',
'zIndex': BI.zIndex_tip - 2,
top: 0,
@@ -18301,7 +18301,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
if (199 < xhr.status && xhr.status < 400) {
upload["onload"]({});
var attachO = BI.jsonDecode(xhr.responseText);
- attachO.filename = BI.cjkDecode(handler.file.fileName);
+ attachO.filename = handler.file.fileName;
if (handler.file.type.indexOf('image') != -1) {
attachO.attach_type = "image";
}
@@ -28516,15 +28516,6 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
}
});
- var tlw = regionSize;
- var tlh = regionSize >= summaryColumnSizeArray[freezeColLength - 1] ? (o.header.length * o.headerRowSize) : (o.header.length * o.headerRowSize + this._scrollBarSize);
- var trw = this._width - regionSize;
- var trh = (this._width - regionSize >= totalColumnSize - (summaryColumnSizeArray[freezeColLength - 1] || 0)) ? (o.header.length * o.headerRowSize) : (o.header.length * o.headerRowSize + this._scrollBarSize);
- var blw = (this._height - o.header.length * o.headerRowSize >= totalRowSize) ? regionSize : (regionSize + this._scrollBarSize);
- var blh = (regionSize >= (summaryColumnSizeArray[freezeColLength - 1] || 0)) ? (this._height - o.header.length * o.headerRowSize) : (this._height - o.header.length * o.headerRowSize + this._scrollBarSize);
- var brw = (this._height - o.header.length * o.headerRowSize >= totalRowSize) ? (this._width - regionSize) : (this._width - regionSize + this._scrollBarSize);
- var brh = (this._width - regionSize >= totalColumnSize - (summaryColumnSizeArray[freezeColLength - 1] || 0)) ? (this._height - o.header.length * o.headerRowSize) : (this._height - o.header.length * o.headerRowSize + this._scrollBarSize);
-
var otlw = regionSize;
var otlh = o.header.length * o.headerRowSize;
var otrw = this._width - regionSize;
@@ -28534,32 +28525,21 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
var obrw = this._width - regionSize;
var obrh = this._height - o.header.length * o.headerRowSize;
- var digest = function (w, h, tw, th, el) {
- if (w >= tw && h >= th) {
- el.element.css({
- overflow: "hidden",
- overflowX: "hidden",
- overflowY: "hidden"
- })
- } else if (w >= tw) {
- el.element.css({
- overflow: "hidden",
- overflowX: "hidden",
- overflowY: "auto"
- })
- } else if (h >= th) {
- el.element.css({
- overflow: "hidden",
- overflowX: "auto",
- overflowY: "hidden"
- })
- } else {
- el.element.css({
- overflow: "auto",
- overflowX: "auto",
- overflowY: "auto"
- })
- }
+ var tlw = otlw + this._scrollBarSize;
+ var tlh = otlh + this._scrollBarSize;
+ var trw = otrw + this._scrollBarSize;
+ var trh = otrh + this._scrollBarSize;
+ var blw = oblw + this._scrollBarSize;
+ var blh = oblh + this._scrollBarSize;
+ var brw = obrw+ this._scrollBarSize;
+ var brh = obrh + this._scrollBarSize;
+
+ var digest = function (el) {
+ el.element.css({
+ overflow: "scroll",
+ overflowX: "scroll",
+ overflowY: "scroll"
+ })
};
this.topLeft.setWidth(otlw);
@@ -28580,10 +28560,10 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
this.bottomRightCollection.setWidth(brw);
this.bottomRightCollection.setHeight(brh);
- digest(tlw, tlh, totalLeftColumnSize, o.header.length * o.headerRowSize, this.topLeftCollection);
- digest(trw, trh, totalRightColumnSize, o.header.length * o.headerRowSize, this.topRightCollection);
- digest(blw, blh, totalLeftColumnSize, o.items.length * o.rowSize, this.bottomLeftCollection);
- digest(brw, brh, totalRightColumnSize, o.items.length * o.rowSize, this.bottomRightCollection);
+ digest(this.topLeftCollection);
+ digest(this.topRightCollection);
+ digest(this.bottomLeftCollection);
+ digest(this.bottomRightCollection);
var items = this.contextLayout.attr("items");
items[1].left = regionSize;
@@ -29314,15 +29294,6 @@ BI.GridTable = BI.inherit(BI.Widget, {
}
});
- var tlw = regionSize;
- var tlh = regionSize >= summaryColumnSizeArray[freezeColLength - 1] ? (o.header.length * o.headerRowSize) : (o.header.length * o.headerRowSize + this._scrollBarSize);
- var trw = this._width - regionSize;
- var trh = (this._width - regionSize >= totalColumnSize - (summaryColumnSizeArray[freezeColLength - 1] || 0)) ? (o.header.length * o.headerRowSize) : (o.header.length * o.headerRowSize + this._scrollBarSize);
- var blw = (this._height - o.header.length * o.headerRowSize >= totalRowSize) ? regionSize : (regionSize + this._scrollBarSize);
- var blh = (regionSize >= (summaryColumnSizeArray[freezeColLength - 1] || 0)) ? (this._height - o.header.length * o.headerRowSize) : (this._height - o.header.length * o.headerRowSize + this._scrollBarSize);
- var brw = (this._height - o.header.length * o.headerRowSize >= totalRowSize) ? (this._width - regionSize) : (this._width - regionSize + this._scrollBarSize);
- var brh = (this._width - regionSize >= totalColumnSize - (summaryColumnSizeArray[freezeColLength - 1] || 0)) ? (this._height - o.header.length * o.headerRowSize) : (this._height - o.header.length * o.headerRowSize + this._scrollBarSize);
-
var otlw = regionSize;
var otlh = o.header.length * o.headerRowSize;
var otrw = this._width - regionSize;
@@ -29332,32 +29303,21 @@ BI.GridTable = BI.inherit(BI.Widget, {
var obrw = this._width - regionSize;
var obrh = this._height - o.header.length * o.headerRowSize;
- var digest = function (w, h, tw, th, el) {
- if (w >= tw && h >= th) {
- el.element.css({
- overflow: "hidden",
- overflowX: "hidden",
- overflowY: "hidden"
- })
- } else if (w >= tw) {
- el.element.css({
- overflow: "hidden",
- overflowX: "hidden",
- overflowY: "auto"
- })
- } else if (h >= th) {
- el.element.css({
- overflow: "hidden",
- overflowX: "auto",
- overflowY: "hidden"
- })
- } else {
- el.element.css({
- overflow: "auto",
- overflowX: "auto",
- overflowY: "auto"
- })
- }
+ var tlw = otlw + this._scrollBarSize;
+ var tlh = otlh + this._scrollBarSize;
+ var trw = otrw + this._scrollBarSize;
+ var trh = otrh + this._scrollBarSize;
+ var blw = oblw + this._scrollBarSize;
+ var blh = oblh + this._scrollBarSize;
+ var brw = obrw+ this._scrollBarSize;
+ var brh = obrh + this._scrollBarSize;
+
+ var digest = function (el) {
+ el.element.css({
+ overflow: "scroll",
+ overflowX: "scroll",
+ overflowY: "scroll"
+ })
};
this.topLeft.setWidth(otlw);
@@ -29378,10 +29338,10 @@ BI.GridTable = BI.inherit(BI.Widget, {
this.bottomRightGrid.setWidth(brw);
this.bottomRightGrid.setHeight(brh);
- digest(tlw, tlh, totalLeftColumnSize, o.header.length * o.headerRowSize, this.topLeftGrid);
- digest(trw, trh, totalRightColumnSize, o.header.length * o.headerRowSize, this.topRightGrid);
- digest(blw, blh, totalLeftColumnSize, o.items.length * o.rowSize, this.bottomLeftGrid);
- digest(brw, brh, totalRightColumnSize, o.items.length * o.rowSize, this.bottomRightGrid);
+ digest(this.topLeftGrid);
+ digest(this.topRightGrid);
+ digest(this.bottomLeftGrid);
+ digest(this.bottomRightGrid);
this.topLeftGrid.setEstimatedColumnSize(freezeColLength > 0 ? totalLeftColumnSize / freezeColLength : 0);
this.topLeftGrid.setEstimatedRowSize(o.headerRowSize);
diff --git a/bi/core.css b/bi/core.css
index 8cb3057e8..0f1f664ff 100644
--- a/bi/core.css
+++ b/bi/core.css
@@ -2956,18 +2956,13 @@
.bi-list-item.disabled,
.bi-list-item.disabled:hover,
.bi-list-item.disabled:active {
- background-color: #ffffff;
+ background-color: transparent !important;
}
.bi-theme-dark .bi-list-item:hover,
.bi-theme-dark .bi-list-item.hover {
background-color: #04070d;
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;
-}
.bi-list-item-effect.active,
.bi-list-item-effect:active {
color: #009de3;
@@ -2975,7 +2970,7 @@
.bi-list-item-effect.disabled,
.bi-list-item-effect.disabled:hover,
.bi-list-item-effect.disabled:active {
- color: #c4c6c6;
+ color: #c4c6c6 !important;
}
.bi-theme-dark .bi-list-item-effect.active,
.bi-theme-dark .bi-list-item-effect:active {
@@ -2984,7 +2979,7 @@
.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 {
- color: #c4c6c6;
+ color: #c4c6c6 !important;
}
.bi-list-item-hover:hover,
.bi-list-item-hover.hover {
@@ -2994,8 +2989,8 @@
.bi-list-item-hover.disabled,
.bi-list-item-hover.disabled:hover,
.bi-list-item-hover.disabled:active {
- color: #c4c6c6;
- background-color: #ffffff;
+ color: #c4c6c6 !important;
+ background-color: transparent !important;
}
.bi-theme-dark .bi-list-item-hover:hover,
.bi-theme-dark .bi-list-item-hover.hover {
@@ -3005,8 +3000,7 @@
.bi-theme-dark .bi-list-item-hover.disabled,
.bi-theme-dark .bi-list-item-hover.disabled:hover,
.bi-theme-dark .bi-list-item-hover.disabled:active {
- color: #c4c6c6;
- background-color: transparent;
+ color: #c4c6c6 !important;
}
.bi-list-item-active:hover,
.bi-list-item-active.hover {
@@ -3020,7 +3014,7 @@
.bi-list-item-active.disabled,
.bi-list-item-active.disabled:hover,
.bi-list-item-active.disabled:active {
- background-color: #ffffff;
+ background-color: transparent !important;
}
.bi-theme-dark .bi-list-item-active:hover,
.bi-theme-dark .bi-list-item-active.hover {
@@ -3032,11 +3026,6 @@
color: #009de3;
background-color: #04070d;
}
-.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;
-}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #009de3;
@@ -3055,7 +3044,7 @@
.bi-list-item-select.disabled:hover,
.bi-list-item-select.disabled:active {
color: #c4c6c6 !important;
- background-color: #ffffff !important;
+ background-color: transparent !important;
}
.bi-list-item-select.disabled .bi-high-light,
.bi-list-item-select.disabled:hover .bi-high-light,
@@ -3076,17 +3065,6 @@
.bi-theme-dark .bi-list-item-select.active .bi-high-light {
color: #ffffff;
}
-.bi-theme-dark .bi-list-item-select.disabled,
-.bi-theme-dark .bi-list-item-select.disabled:hover,
-.bi-theme-dark .bi-list-item-select.disabled:active {
- color: #c4c6c6 !important;
- background-color: transparent !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 {
- color: #c4c6c6 !important;
-}
/*****************cursor*****************/
.cursor-pointer {
cursor: pointer;
diff --git a/bi/core.js b/bi/core.js
index 543d92175..fdac19401 100644
--- a/bi/core.js
+++ b/bi/core.js
@@ -4333,6 +4333,9 @@ BI.Widget = BI.inherit(BI.OB, {
}
this.element = this.options.element.element;
} else if (o.element) {
+ // if (o.root !== true) {
+ // throw new Error("root is a required property");
+ // }
this.element = $(o.element);
this._isRoot = true;
} else {
@@ -17031,7 +17034,7 @@ $(function () {
}
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) {
return true;
}
return false;
diff --git a/demo.html b/demo.html
index 55b264445..86967f360 100644
--- a/demo.html
+++ b/demo.html
@@ -22,7 +22,7 @@
-
+