guy 8 years ago
parent
commit
7749ecea49
  1. 10
      bi/base.js
  2. 34
      bi/core.js
  3. 23
      bi/widget.css
  4. 10
      docs/base.js
  5. 34
      docs/core.js
  6. 23
      docs/widget.css
  7. 7
      src/base/layer/layer.popup.js
  8. 3
      src/base/table/table.js
  9. 2
      src/core/func/function.js
  10. 17
      src/core/widget.js
  11. 15
      src/core/wrapper/layout.js
  12. 2
      src/css/lib/style.css
  13. 4
      src/css/widget/multiselect/trigger/button.checkselected.css
  14. 6
      src/css/widget/multitree/check/multi.tree.check.pane.css
  15. 3
      src/css/widget/multitree/display.multi.tree.css
  16. 9
      src/css/widget/multitree/trigger.multi.tree.css
  17. 1
      src/css/widget/multitree/trigger/multi.tree.button.checkselected.css
  18. 3
      src/less/bibase.less
  19. 3
      src/less/lib/style.less
  20. 7
      src/less/widget/multiselect/trigger/button.checkselected.less
  21. 14
      src/less/widget/multitree/check/multi.tree.check.pane.less
  22. 1
      src/less/widget/multitree/display.multi.tree.less
  23. 11
      src/less/widget/multitree/trigger.multi.tree.less
  24. 1
      src/less/widget/multitree/trigger/multi.tree.button.checkselected.less

10
bi/base.js

@ -15044,12 +15044,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px"
}).bind({"click": fn});
//FIXME IE8下 jquery.mousewheeel.js 第一次执行65行$elem["offsetParent"]()的时候报错:未指明的错误 但是第二次或者调试的时候展开一下$elem内容均能避免上述问题
try {
this.element.bind("mousewheel", fn);
} catch (e) {
this.element.bind("mousewheel", fn);
}
this.element.bind("mousewheel", fn);
o.stopPropagation && this.element.bind({"mousedown": fn, "mouseup": fn, "mouseover": fn});
o.stopEvent && this.element.bind({"mousedown": stop, "mouseup": stop, "mouseover": stop});
@ -30824,13 +30819,14 @@ BI.Table = BI.inherit(BI.Widget, {
.addClass(c === rows.length - 1 ? "last-col" : "");
var w = BI.createWidget(map[r][c], {
type: "bi.table_cell",
root: true,
textAlign: "left",
width: BI.isNumeric(width) ? width : "",
height: BI.isNumeric(height) ? height : "",
_row: r,
_col: c + start
});
self.addWidget(w.getName(), w);
w._mount();
w.element.css("position", "relative");
td.append(w.element);
tr.append(td);

34
bi/core.js

@ -4426,27 +4426,14 @@ BI.Widget = BI.inherit(BI.OB, {
}
this.beforeMounted && this.beforeMounted();
this._isMounted = true;
this._mountChildren();
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
widget._mount && widget._mount();
});
this.mounted && this.mounted();
},
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
frag.appendChild(widget.element[0]);
hasChild = true;
}
});
if (hasChild === true) {
this.element.append(frag);
}
},
_mountChildren: null,
_unMount: function () {
BI.each(this._children, function (i, widget) {
@ -11110,6 +11097,21 @@ BI.Layout = BI.inherit(BI.Widget, {
}
},
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
frag.appendChild(widget.element[0]);
hasChild = true;
}
});
if (hasChild === true) {
this.element.append(frag);
}
},
_getChildName: function (index) {
return index + "";
},
@ -17034,7 +17036,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 < 192) {
if (grayLevel < 140) {
return true;
}
return false;

23
bi/widget.css

@ -333,12 +333,8 @@
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
.bi-theme-dark .bi-multi-select-check-selected-button {
background-color: #191a2c;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
@ -353,18 +349,15 @@
.bi-multi-tree-check-pane {
background-color: #f4f4f4;
}
.bi-multi-tree-check-pane .multi-tree-continue-select {
background-color: #f4f4f4;
}
.bi-multi-tree-check-pane .multi-tree-check-selected {
color: #009de3;
}
.bi-theme-dark .bi-multi-tree-check-pane {
background-color: #191a2c;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-multi-tree-display {
background-color: #f4f4f4;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
@ -415,15 +408,6 @@
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-tree-trigger .trigger-check-selected {
border: 1px solid #009de3;
-webkit-border-radius: 8px 8px 8px 8px;
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
.bi-multi-tree-trigger .trigger-icon-button {
border-left: 1px solid #d4dadd;
font-size: 16px;
@ -437,7 +421,6 @@
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
/****添加计算宽度的--运算符直接需要space****/

10
docs/base.js

@ -15044,12 +15044,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px"
}).bind({"click": fn});
//FIXME IE8下 jquery.mousewheeel.js 第一次执行65行$elem["offsetParent"]()的时候报错:未指明的错误 但是第二次或者调试的时候展开一下$elem内容均能避免上述问题
try {
this.element.bind("mousewheel", fn);
} catch (e) {
this.element.bind("mousewheel", fn);
}
this.element.bind("mousewheel", fn);
o.stopPropagation && this.element.bind({"mousedown": fn, "mouseup": fn, "mouseover": fn});
o.stopEvent && this.element.bind({"mousedown": stop, "mouseup": stop, "mouseover": stop});
@ -30824,13 +30819,14 @@ BI.Table = BI.inherit(BI.Widget, {
.addClass(c === rows.length - 1 ? "last-col" : "");
var w = BI.createWidget(map[r][c], {
type: "bi.table_cell",
root: true,
textAlign: "left",
width: BI.isNumeric(width) ? width : "",
height: BI.isNumeric(height) ? height : "",
_row: r,
_col: c + start
});
self.addWidget(w.getName(), w);
w._mount();
w.element.css("position", "relative");
td.append(w.element);
tr.append(td);

34
docs/core.js

@ -14421,27 +14421,14 @@ BI.Widget = BI.inherit(BI.OB, {
}
this.beforeMounted && this.beforeMounted();
this._isMounted = true;
this._mountChildren();
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
widget._mount && widget._mount();
});
this.mounted && this.mounted();
},
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
frag.appendChild(widget.element[0]);
hasChild = true;
}
});
if (hasChild === true) {
this.element.append(frag);
}
},
_mountChildren: null,
_unMount: function () {
BI.each(this._children, function (i, widget) {
@ -19326,6 +19313,21 @@ BI.Layout = BI.inherit(BI.Widget, {
}
},
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
frag.appendChild(widget.element[0]);
hasChild = true;
}
});
if (hasChild === true) {
this.element.append(frag);
}
},
_getChildName: function (index) {
return index + "";
},
@ -22658,7 +22660,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 < 192) {
if (grayLevel < 140) {
return true;
}
return false;

23
docs/widget.css

@ -333,12 +333,8 @@
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
.bi-theme-dark .bi-multi-select-check-selected-button {
background-color: #191a2c;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
@ -353,18 +349,15 @@
.bi-multi-tree-check-pane {
background-color: #f4f4f4;
}
.bi-multi-tree-check-pane .multi-tree-continue-select {
background-color: #f4f4f4;
}
.bi-multi-tree-check-pane .multi-tree-check-selected {
color: #009de3;
}
.bi-theme-dark .bi-multi-tree-check-pane {
background-color: #191a2c;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-multi-tree-display {
background-color: #f4f4f4;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
@ -415,15 +408,6 @@
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-tree-trigger .trigger-check-selected {
border: 1px solid #009de3;
-webkit-border-radius: 8px 8px 8px 8px;
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
.bi-multi-tree-trigger .trigger-icon-button {
border-left: 1px solid #d4dadd;
font-size: 16px;
@ -437,7 +421,6 @@
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
/****添加计算宽度的--运算符直接需要space****/

7
src/base/layer/layer.popup.js

@ -55,12 +55,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px"
}).bind({"click": fn});
//FIXME IE8下 jquery.mousewheeel.js 第一次执行65行$elem["offsetParent"]()的时候报错:未指明的错误 但是第二次或者调试的时候展开一下$elem内容均能避免上述问题
try {
this.element.bind("mousewheel", fn);
} catch (e) {
this.element.bind("mousewheel", fn);
}
this.element.bind("mousewheel", fn);
o.stopPropagation && this.element.bind({"mousedown": fn, "mouseup": fn, "mouseover": fn});
o.stopEvent && this.element.bind({"mousedown": stop, "mouseup": stop, "mouseover": stop});

3
src/base/table/table.js

@ -743,13 +743,14 @@ BI.Table = BI.inherit(BI.Widget, {
.addClass(c === rows.length - 1 ? "last-col" : "");
var w = BI.createWidget(map[r][c], {
type: "bi.table_cell",
root: true,
textAlign: "left",
width: BI.isNumeric(width) ? width : "",
height: BI.isNumeric(height) ? height : "",
_row: r,
_col: c + start
});
self.addWidget(w.getName(), w);
w._mount();
w.element.css("position", "relative");
td.append(w.element);
tr.append(td);

2
src/core/func/function.js

@ -129,7 +129,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 < 192) {
if (grayLevel < 140) {
return true;
}
return false;

17
src/core/widget.js

@ -161,27 +161,14 @@ BI.Widget = BI.inherit(BI.OB, {
}
this.beforeMounted && this.beforeMounted();
this._isMounted = true;
this._mountChildren();
this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) {
widget._mount && widget._mount();
});
this.mounted && this.mounted();
},
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
frag.appendChild(widget.element[0]);
hasChild = true;
}
});
if (hasChild === true) {
this.element.append(frag);
}
},
_mountChildren: null,
_unMount: function () {
BI.each(this._children, function (i, widget) {

15
src/core/wrapper/layout.js

@ -63,6 +63,21 @@ BI.Layout = BI.inherit(BI.Widget, {
}
},
_mountChildren: function () {
var self = this;
var frag = document.createDocumentFragment();
var hasChild = false;
BI.each(this._children, function (i, widget) {
if (widget.element !== self.element) {
frag.appendChild(widget.element[0]);
hasChild = true;
}
});
if (hasChild === true) {
this.element.append(frag);
}
},
_getChildName: function (index) {
return index + "";
},

2
src/css/lib/style.css

@ -1,2 +0,0 @@
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/

4
src/css/widget/multiselect/trigger/button.checkselected.css

@ -7,9 +7,5 @@
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
.bi-theme-dark .bi-multi-select-check-selected-button {
background-color: #191a2c;
}

6
src/css/widget/multitree/check/multi.tree.check.pane.css

@ -4,9 +4,9 @@
.bi-multi-tree-check-pane {
background-color: #f4f4f4;
}
.bi-multi-tree-check-pane .multi-tree-continue-select {
background-color: #f4f4f4;
}
.bi-multi-tree-check-pane .multi-tree-check-selected {
color: #009de3;
}
.bi-theme-dark .bi-multi-tree-check-pane {
background-color: #191a2c;
}

3
src/css/widget/multitree/display.multi.tree.css

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

9
src/css/widget/multitree/trigger.multi.tree.css

@ -7,15 +7,6 @@
-moz-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
}
.bi-multi-tree-trigger .trigger-check-selected {
border: 1px solid #009de3;
-webkit-border-radius: 8px 8px 8px 8px;
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}
.bi-multi-tree-trigger .trigger-icon-button {
border-left: 1px solid #d4dadd;
font-size: 16px;

1
src/css/widget/multitree/trigger/multi.tree.button.checkselected.css

@ -7,6 +7,5 @@
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
color: #009de3;
background-color: #ffffff;
z-index: 1;
}

3
src/less/bibase.less

@ -3,5 +3,4 @@
@import "typographic";
@import "visual";
@import "var";
@import "lib/colors";
@import "lib/style";
@import "lib/colors";

3
src/less/lib/style.less

@ -1,3 +0,0 @@
@import "colors";
//公共样式类库

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

@ -4,12 +4,5 @@
border: 1px solid @color-bi-text-highlight;
.border-corner-radius(8px, 8px, 8px, 8px);
color: @color-bi-text-highlight;
background-color: @color-bi-background-default;
z-index: 1;
}
.bi-theme-dark {
.bi-multi-select-check-selected-button {
background-color: @color-bi-background-normal-theme-dark;
}
}

14
src/less/widget/multitree/check/multi.tree.check.pane.less

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

1
src/less/widget/multitree/display.multi.tree.less

@ -1,5 +1,4 @@
@import "../../bibase";
.bi-multi-tree-display{
background-color: @color-bi-background-gray;
}

11
src/less/widget/multitree/trigger.multi.tree.less

@ -1,17 +1,10 @@
@import "../../bibase";
.bi-multi-tree-trigger{
.bi-multi-tree-trigger {
border: 1px solid @color-bi-border-normal;
.border-corner-radius(2px, 2px, 2px, 2px);
& .trigger-check-selected{
border: 1px solid @color-bi-text-highlight;
.border-corner-radius(8px, 8px, 8px, 8px);
color: @color-bi-text-highlight;
background-color: @color-bi-background-default;
z-index: 1;
}
& .trigger-icon-button{
& .trigger-icon-button {
border-left: 1px solid @color-bi-border-normal;
font-size: 16px;
}

1
src/less/widget/multitree/trigger/multi.tree.button.checkselected.less

@ -5,7 +5,6 @@
border: 1px solid @color-bi-text-highlight;
.border-corner-radius(8px, 8px, 8px, 8px);
color: @color-bi-text-highlight;
background-color: @color-bi-background-default;
z-index: 1;
}
}
Loading…
Cancel
Save