Browse Source

Merge pull request #680 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master

* commit 'f4d63fe3935b37a666cc1178765d4f0b978dc5c3':
  update
  DEC-4200 平台日志的详细信息图标,鼠标放上去提示不灵敏
es6
Frank.Qiu 6 years ago
parent
commit
29b99d3326
  1. 5
      dist/bundle.js
  2. 5
      dist/core.js
  3. 5
      dist/fineui.js
  4. 5
      src/core/platform/web/jquery/fn.js

5
dist/bundle.js vendored

@ -29804,8 +29804,9 @@ $.extend($.Event.prototype, {
var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
var width = offset2Body.width || this.outerWidth(); var width = offset2Body.width || this.outerWidth();
var height = offset2Body.height || this.outerHeight(); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width // offset2Body.left的值可能会有小数,导致某点出现false
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height); return !(e.pageX < Math.floor(offset2Body.left) || e.pageX > offset2Body.left + width
|| e.pageY < Math.floor(offset2Body.top) || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {

5
dist/core.js vendored

@ -29804,8 +29804,9 @@ $.extend($.Event.prototype, {
var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
var width = offset2Body.width || this.outerWidth(); var width = offset2Body.width || this.outerWidth();
var height = offset2Body.height || this.outerHeight(); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width // offset2Body.left的值可能会有小数,导致某点出现false
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height); return !(e.pageX < Math.floor(offset2Body.left) || e.pageX > offset2Body.left + width
|| e.pageY < Math.floor(offset2Body.top) || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {

5
dist/fineui.js vendored

@ -30046,8 +30046,9 @@ $.extend($.Event.prototype, {
var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
var width = offset2Body.width || this.outerWidth(); var width = offset2Body.width || this.outerWidth();
var height = offset2Body.height || this.outerHeight(); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width // offset2Body.left的值可能会有小数,导致某点出现false
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height); return !(e.pageX < Math.floor(offset2Body.left) || e.pageX > offset2Body.left + width
|| e.pageY < Math.floor(offset2Body.top) || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {

5
src/core/platform/web/jquery/fn.js vendored

@ -176,8 +176,9 @@ if (jQuery) {
var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
var width = offset2Body.width || this.outerWidth(); var width = offset2Body.width || this.outerWidth();
var height = offset2Body.height || this.outerHeight(); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width // offset2Body.left的值可能会有小数,导致某点出现false
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height); return !(e.pageX < Math.floor(offset2Body.left) || e.pageX > offset2Body.left + width
|| e.pageY < Math.floor(offset2Body.top) || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {

Loading…
Cancel
Save