Browse Source

Merge pull request #593 in VISUAL/fineui from ~LEI.WANG/fineui:master to master

* commit '1fc76a9fe3c1130fec268e0a0d7ace5c83d6bb0b':
  无jira任务 "bi.multi_select_bar"中点击text与点击icon触发事件的参数不一致
es6
lei.wang 6 years ago
parent
commit
0d2f803053
  1. 3
      dist/base.css
  2. 3
      dist/bundle.css
  3. 16
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 24
      dist/bundle.min.js
  6. 5
      dist/case.js
  7. 11
      dist/core.js
  8. 3
      dist/fineui.css
  9. 16
      dist/fineui.js
  10. 2
      dist/fineui.min.css
  11. 18
      dist/fineui.min.js
  12. 4
      src/case/toolbar/toolbar.multiselect.js
  13. 3
      src/css/base/single/tip/tip.css

3
dist/base.css vendored

@ -1162,7 +1162,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px;
}
.bi-bubble .bubble-error {
background: #ffecec;
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
color: #ff4949;
}
.bi-bubble .bubble-common {

3
dist/bundle.css vendored

@ -3098,7 +3098,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px;
}
.bi-bubble .bubble-error {
background: #ffecec;
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
color: #ff4949;
}
.bi-bubble .bubble-common {

16
dist/bundle.js vendored

@ -9401,12 +9401,15 @@ jQuery.fn.offset = function( options ) {
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
@ -57570,12 +57573,13 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
doClick: function () {
BI.MultiSelectBar.superclass.doClick.apply(this, arguments);
if(this.isValid()) {
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE);
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, this.isSelected(), this);
}
}
});
BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE";
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);/**
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);
/**
* guy
* 异步树
* @class BI.DisplayTree

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

24
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/case.js vendored

@ -8941,12 +8941,13 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
doClick: function () {
BI.MultiSelectBar.superclass.doClick.apply(this, arguments);
if(this.isValid()) {
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE);
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, this.isSelected(), this);
}
}
});
BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE";
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);/**
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);
/**
* guy
* 异步树
* @class BI.DisplayTree

11
dist/core.js vendored

@ -9401,12 +9401,15 @@ jQuery.fn.offset = function( options ) {
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),

3
dist/fineui.css vendored

@ -3098,7 +3098,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-radius: 2px;
}
.bi-bubble .bubble-error {
background: #ffecec;
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
color: #ff4949;
}
.bi-bubble .bubble-common {

16
dist/fineui.js vendored

@ -9622,12 +9622,15 @@ jQuery.fn.offset = function( options ) {
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
@ -57791,12 +57794,13 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
doClick: function () {
BI.MultiSelectBar.superclass.doClick.apply(this, arguments);
if(this.isValid()) {
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE);
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, this.isSelected(), this);
}
}
});
BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE";
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);/**
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);
/**
* guy
* 异步树
* @class BI.DisplayTree

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

18
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
src/case/toolbar/toolbar.multiselect.js

@ -131,9 +131,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
doClick: function () {
BI.MultiSelectBar.superclass.doClick.apply(this, arguments);
if(this.isValid()) {
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE);
this.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, this.isSelected(), this);
}
}
});
BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE";
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);
BI.shortcut("bi.multi_select_bar", BI.MultiSelectBar);

3
src/css/base/single/tip/tip.css

@ -4,7 +4,8 @@
border-radius: 2px;
}
.bi-bubble .bubble-error {
background: #ffecec;
background-color: rgba(255, 73, 73, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1aff4949,endColorstr=#1aff4949);
color: #ff4949;
}
.bi-bubble .bubble-common {

Loading…
Cancel
Save