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. 4682
      dist/base.js
  2. 4865
      dist/bundle.js
  3. 58
      dist/case.js
  4. 5
      dist/core.js
  5. 4865
      dist/fineui.js
  6. 38
      dist/widget.js
  7. 5
      src/core/platform/web/jquery/fn.js

4682
dist/base.js vendored

File diff suppressed because it is too large Load Diff

4865
dist/bundle.js vendored

File diff suppressed because it is too large Load Diff

58
dist/case.js vendored

@ -111,35 +111,35 @@ BI.HalfIconButton = BI.inherit(BI.IconButton, {
}); });
BI.HalfIconButton.EVENT_CHANGE = "HalfIconButton.EVENT_CHANGE"; BI.HalfIconButton.EVENT_CHANGE = "HalfIconButton.EVENT_CHANGE";
BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/** BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
* 统一的trigger图标按钮 * 统一的trigger图标按钮
* *
* Created by GUY on 2015/9/16. * Created by GUY on 2015/9/16.
* @class BI.TriggerIconButton * @class BI.TriggerIconButton
* @extends BI.IconButton * @extends BI.IconButton
*/ */
BI.TriggerIconButton = BI.inherit(BI.IconButton, { BI.TriggerIconButton = BI.inherit(BI.IconButton, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger-icon-button", baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
extraCls: "pull-down-font" extraCls: "pull-down-font"
}); });
}, },
_init: function () { _init: function () {
BI.TriggerIconButton.superclass._init.apply(this, arguments); BI.TriggerIconButton.superclass._init.apply(this, arguments);
}, },
doClick: function () { doClick: function () {
BI.TriggerIconButton.superclass.doClick.apply(this, arguments); BI.TriggerIconButton.superclass.doClick.apply(this, arguments);
if (this.isValid()) { if (this.isValid()) {
this.fireEvent(BI.TriggerIconButton.EVENT_CHANGE, this); this.fireEvent(BI.TriggerIconButton.EVENT_CHANGE, this);
} }
} }
}); });
BI.TriggerIconButton.EVENT_CHANGE = "TriggerIconButton.EVENT_CHANGE"; BI.TriggerIconButton.EVENT_CHANGE = "TriggerIconButton.EVENT_CHANGE";
BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);/** BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);/**
* guy * guy
* 复选框item * 复选框item

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) {

4865
dist/fineui.js vendored

File diff suppressed because it is too large Load Diff

38
dist/widget.js vendored

@ -4934,25 +4934,25 @@ BI.SearchEditor.EVENT_ENTER = "EVENT_ENTER";
BI.SearchEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.SearchEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.SearchEditor.EVENT_REMOVE = "EVENT_REMOVE"; BI.SearchEditor.EVENT_REMOVE = "EVENT_REMOVE";
BI.SearchEditor.EVENT_EMPTY = "EVENT_EMPTY"; BI.SearchEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.search_editor", BI.SearchEditor);/** BI.shortcut("bi.search_editor", BI.SearchEditor);/**
* 小号搜索框 * 小号搜索框
* Created by GUY on 2015/9/29. * Created by GUY on 2015/9/29.
* @class BI.SmallSearchEditor * @class BI.SmallSearchEditor
* @extends BI.SearchEditor * @extends BI.SearchEditor
*/ */
BI.SmallSearchEditor = BI.inherit(BI.SearchEditor, { BI.SmallSearchEditor = BI.inherit(BI.SearchEditor, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.SmallSearchEditor.superclass._defaultConfig.apply(this, arguments); var conf = BI.SmallSearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-small-search-editor", baseCls: (conf.baseCls || "") + " bi-small-search-editor",
height: 24 height: 24
}); });
}, },
_init: function () { _init: function () {
BI.SmallSearchEditor.superclass._init.apply(this, arguments); BI.SmallSearchEditor.superclass._init.apply(this, arguments);
} }
}); });
BI.shortcut("bi.small_search_editor", BI.SmallSearchEditor);/** BI.shortcut("bi.small_search_editor", BI.SmallSearchEditor);/**
* guy * guy
* @class BI.TextEditor * @class BI.TextEditor

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