Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master) 

* commit '675dd4a4011ab51452bb6c1702c33062830e4aa7':
  update
  无JIRA任务 fix更新
  无JIRA任务 fix更新
  update
  BI-32433
  update
es6
Frank.Qiu 6 years ago
parent
f52fa96a95 675dd4a401
commit
58fe410eb8
13 changed files with 365 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      dist/base.js
  2. 96
      dist/bundle.js
  3. 56
      dist/bundle.min.js
  4. 96
      dist/fineui.js
  5. 56
      dist/fineui.min.js
  6. 96
      dist/fineui_without_jquery_polyfill.js
  7. 17
      dist/fix/fix.js
  8. 2
      dist/utils.min.js
  9. 8
      dist/widget.js
  10. 63
      src/base/combination/combo.js
  11. 8
      src/base/single/button/button.basic.js
  12. 4
      src/widget/downlist/combo.downlist.js
  13. 4
      src/widget/multilayerdownlist/combo.downlist.js

71
dist/base.js vendored
Unescape View File

@ -915,7 +915,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
} }
}, },
_trigger: function () { _trigger: function (e) {
var o = this.options; var o = this.options;
if (!this.isEnabled()) { if (!this.isEnabled()) {
return; return;
@ -926,9 +926,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.setSelected(!this.isSelected())); this.setSelected(!this.isSelected()));
} }
if (this.isValid()) { if (this.isValid()) {
o.handler.call(this, this.getValue(), this); o.handler.call(this, this.getValue(), this, e);
var v = this.getValue(); var v = this.getValue();
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this, e);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, "click", o); BI.Actions.runAction(o.action, "click", o);
@ -941,7 +941,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (this.isValid()) { if (this.isValid()) {
this.beforeClick(e); this.beforeClick(e);
} }
this._trigger(); this._trigger(e);
if (this.isValid()) { if (this.isValid()) {
this.doClick(e); this.doClick(e);
} }
@ -3204,13 +3204,13 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
_popupView: function () { _popupView: function (e) {
this._assertPopupViewRender(); this._assertPopupViewRender();
this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
this.popupView.visible(); this.popupView.visible();
this.adjustWidth(); this.adjustWidth(e);
this.adjustHeight(); this.adjustHeight(e);
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
@ -3218,7 +3218,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
adjustWidth: function () { adjustWidth: function (e) {
var o = this.options; var o = this.options;
if (!this.popupView) { if (!this.popupView) {
return; return;
@ -3236,59 +3236,84 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
}, },
adjustHeight: function () { adjustHeight: function (e) {
var o = this.options, p = {}; var o = this.options, p = {};
if (!this.popupView) { if (!this.popupView) {
return; return;
} }
var isVisible = this.popupView.isVisible(); var isVisible = this.popupView.isVisible();
this.popupView.visible(); this.popupView.visible();
var combo = BI.isNotNull(e) ? {
element: {
offset: function () {
return {
left: e.pageX,
top: e.pageY
};
},
bounds: function () {
// offset为其相对于父定位元素的偏移
return {
x: e.offsetX,
y: e.offsetY,
width: 0,
height: 24
};
},
outerWidth: function () {
return 0;
},
outerHeight: function () {
return 24;
}
}
} : this.combo;
switch (o.direction) { switch (o.direction) {
case "bottom": case "bottom":
case "bottom,right": case "bottom,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle);
break; break;
case "top": case "top":
case "top,right": case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle);
break; break;
case "left": case "left":
case "left,bottom": case "left,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle);
break; break;
case "right": case "right":
case "right,bottom": case "right,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle);
break; break;
case "top,left": case "top,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle);
break; break;
case "bottom,left": case "bottom,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle);
break; break;
case "left,top": case "left,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle);
break; break;
case "right,top": case "right,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle);
break; break;
case "top,custom": case "top,custom":
case "custom,top": case "custom,top":
p = $.getTopAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "custom,bottom": case "custom,bottom":
case "bottom,custom": case "bottom,custom":
p = $.getBottomAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getBottomAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "left,custom": case "left,custom":
case "custom,left": case "custom,left":
p = $.getLeftAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getLeftAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
case "custom,right": case "custom,right":
case "right,custom": case "right,custom":
p = $.getRightAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getRightAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
@ -3359,9 +3384,9 @@ BI.Combo = BI.inherit(BI.Widget, {
return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible(); return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible();
}, },
showView: function () { showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) { if (this.isEnabled() && this.combo.isEnabled()) {
this._popupView(); this._popupView(e);
} }
}, },

96
dist/bundle.js vendored
Unescape View File

@ -34412,11 +34412,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
ob.parent = parentObserver || ob.parent; if (ob) {
ob.parentKey = parentKey; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey;
}
return ob; return ob;
} }
@ -34504,9 +34506,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -34529,7 +34536,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;
@ -36281,7 +36288,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
} }
}, },
_trigger: function () { _trigger: function (e) {
var o = this.options; var o = this.options;
if (!this.isEnabled()) { if (!this.isEnabled()) {
return; return;
@ -36292,9 +36299,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.setSelected(!this.isSelected())); this.setSelected(!this.isSelected()));
} }
if (this.isValid()) { if (this.isValid()) {
o.handler.call(this, this.getValue(), this); o.handler.call(this, this.getValue(), this, e);
var v = this.getValue(); var v = this.getValue();
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this, e);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, "click", o); BI.Actions.runAction(o.action, "click", o);
@ -36307,7 +36314,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (this.isValid()) { if (this.isValid()) {
this.beforeClick(e); this.beforeClick(e);
} }
this._trigger(); this._trigger(e);
if (this.isValid()) { if (this.isValid()) {
this.doClick(e); this.doClick(e);
} }
@ -38570,13 +38577,13 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
_popupView: function () { _popupView: function (e) {
this._assertPopupViewRender(); this._assertPopupViewRender();
this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
this.popupView.visible(); this.popupView.visible();
this.adjustWidth(); this.adjustWidth(e);
this.adjustHeight(); this.adjustHeight(e);
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
@ -38584,7 +38591,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
adjustWidth: function () { adjustWidth: function (e) {
var o = this.options; var o = this.options;
if (!this.popupView) { if (!this.popupView) {
return; return;
@ -38602,59 +38609,84 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
}, },
adjustHeight: function () { adjustHeight: function (e) {
var o = this.options, p = {}; var o = this.options, p = {};
if (!this.popupView) { if (!this.popupView) {
return; return;
} }
var isVisible = this.popupView.isVisible(); var isVisible = this.popupView.isVisible();
this.popupView.visible(); this.popupView.visible();
var combo = BI.isNotNull(e) ? {
element: {
offset: function () {
return {
left: e.pageX,
top: e.pageY
};
},
bounds: function () {
// offset为其相对于父定位元素的偏移
return {
x: e.offsetX,
y: e.offsetY,
width: 0,
height: 24
};
},
outerWidth: function () {
return 0;
},
outerHeight: function () {
return 24;
}
}
} : this.combo;
switch (o.direction) { switch (o.direction) {
case "bottom": case "bottom":
case "bottom,right": case "bottom,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle);
break; break;
case "top": case "top":
case "top,right": case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle);
break; break;
case "left": case "left":
case "left,bottom": case "left,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle);
break; break;
case "right": case "right":
case "right,bottom": case "right,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle);
break; break;
case "top,left": case "top,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle);
break; break;
case "bottom,left": case "bottom,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle);
break; break;
case "left,top": case "left,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle);
break; break;
case "right,top": case "right,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle);
break; break;
case "top,custom": case "top,custom":
case "custom,top": case "custom,top":
p = $.getTopAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "custom,bottom": case "custom,bottom":
case "bottom,custom": case "bottom,custom":
p = $.getBottomAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getBottomAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "left,custom": case "left,custom":
case "custom,left": case "custom,left":
p = $.getLeftAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getLeftAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
case "custom,right": case "custom,right":
case "right,custom": case "right,custom":
p = $.getRightAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getRightAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
@ -38725,9 +38757,9 @@ BI.Combo = BI.inherit(BI.Widget, {
return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible(); return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible();
}, },
showView: function () { showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) { if (this.isEnabled() && this.combo.isEnabled()) {
this._popupView(); this._popupView(e);
} }
}, },
@ -60426,8 +60458,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {
@ -64802,8 +64834,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {

56
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

96
dist/fineui.js vendored
Unescape View File

@ -34654,11 +34654,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
ob.parent = parentObserver || ob.parent; if (ob) {
ob.parentKey = parentKey; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey;
}
return ob; return ob;
} }
@ -34746,9 +34748,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -34771,7 +34778,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;
@ -36523,7 +36530,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
} }
}, },
_trigger: function () { _trigger: function (e) {
var o = this.options; var o = this.options;
if (!this.isEnabled()) { if (!this.isEnabled()) {
return; return;
@ -36534,9 +36541,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.setSelected(!this.isSelected())); this.setSelected(!this.isSelected()));
} }
if (this.isValid()) { if (this.isValid()) {
o.handler.call(this, this.getValue(), this); o.handler.call(this, this.getValue(), this, e);
var v = this.getValue(); var v = this.getValue();
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this, e);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, "click", o); BI.Actions.runAction(o.action, "click", o);
@ -36549,7 +36556,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (this.isValid()) { if (this.isValid()) {
this.beforeClick(e); this.beforeClick(e);
} }
this._trigger(); this._trigger(e);
if (this.isValid()) { if (this.isValid()) {
this.doClick(e); this.doClick(e);
} }
@ -38812,13 +38819,13 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
_popupView: function () { _popupView: function (e) {
this._assertPopupViewRender(); this._assertPopupViewRender();
this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
this.popupView.visible(); this.popupView.visible();
this.adjustWidth(); this.adjustWidth(e);
this.adjustHeight(); this.adjustHeight(e);
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
@ -38826,7 +38833,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
adjustWidth: function () { adjustWidth: function (e) {
var o = this.options; var o = this.options;
if (!this.popupView) { if (!this.popupView) {
return; return;
@ -38844,59 +38851,84 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
}, },
adjustHeight: function () { adjustHeight: function (e) {
var o = this.options, p = {}; var o = this.options, p = {};
if (!this.popupView) { if (!this.popupView) {
return; return;
} }
var isVisible = this.popupView.isVisible(); var isVisible = this.popupView.isVisible();
this.popupView.visible(); this.popupView.visible();
var combo = BI.isNotNull(e) ? {
element: {
offset: function () {
return {
left: e.pageX,
top: e.pageY
};
},
bounds: function () {
// offset为其相对于父定位元素的偏移
return {
x: e.offsetX,
y: e.offsetY,
width: 0,
height: 24
};
},
outerWidth: function () {
return 0;
},
outerHeight: function () {
return 24;
}
}
} : this.combo;
switch (o.direction) { switch (o.direction) {
case "bottom": case "bottom":
case "bottom,right": case "bottom,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle);
break; break;
case "top": case "top":
case "top,right": case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle);
break; break;
case "left": case "left":
case "left,bottom": case "left,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle);
break; break;
case "right": case "right":
case "right,bottom": case "right,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle);
break; break;
case "top,left": case "top,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle);
break; break;
case "bottom,left": case "bottom,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle);
break; break;
case "left,top": case "left,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle);
break; break;
case "right,top": case "right,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle);
break; break;
case "top,custom": case "top,custom":
case "custom,top": case "custom,top":
p = $.getTopAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "custom,bottom": case "custom,bottom":
case "bottom,custom": case "bottom,custom":
p = $.getBottomAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getBottomAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "left,custom": case "left,custom":
case "custom,left": case "custom,left":
p = $.getLeftAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getLeftAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
case "custom,right": case "custom,right":
case "right,custom": case "right,custom":
p = $.getRightAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getRightAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
@ -38967,9 +38999,9 @@ BI.Combo = BI.inherit(BI.Widget, {
return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible(); return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible();
}, },
showView: function () { showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) { if (this.isEnabled() && this.combo.isEnabled()) {
this._popupView(); this._popupView(e);
} }
}, },
@ -60668,8 +60700,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {
@ -65044,8 +65076,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {

56
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

96
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -23423,11 +23423,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
ob.parent = parentObserver || ob.parent; if (ob) {
ob.parentKey = parentKey; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey;
}
return ob; return ob;
} }
@ -23515,9 +23517,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -23540,7 +23547,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;
@ -25091,7 +25098,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
} }
}, },
_trigger: function () { _trigger: function (e) {
var o = this.options; var o = this.options;
if (!this.isEnabled()) { if (!this.isEnabled()) {
return; return;
@ -25102,9 +25109,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.setSelected(!this.isSelected())); this.setSelected(!this.isSelected()));
} }
if (this.isValid()) { if (this.isValid()) {
o.handler.call(this, this.getValue(), this); o.handler.call(this, this.getValue(), this, e);
var v = this.getValue(); var v = this.getValue();
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this, e);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, "click", o); BI.Actions.runAction(o.action, "click", o);
@ -25117,7 +25124,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (this.isValid()) { if (this.isValid()) {
this.beforeClick(e); this.beforeClick(e);
} }
this._trigger(); this._trigger(e);
if (this.isValid()) { if (this.isValid()) {
this.doClick(e); this.doClick(e);
} }
@ -26480,13 +26487,13 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
_popupView: function () { _popupView: function (e) {
this._assertPopupViewRender(); this._assertPopupViewRender();
this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
this.popupView.visible(); this.popupView.visible();
this.adjustWidth(); this.adjustWidth(e);
this.adjustHeight(); this.adjustHeight(e);
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
@ -26494,7 +26501,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
adjustWidth: function () { adjustWidth: function (e) {
var o = this.options; var o = this.options;
if (!this.popupView) { if (!this.popupView) {
return; return;
@ -26512,59 +26519,84 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
}, },
adjustHeight: function () { adjustHeight: function (e) {
var o = this.options, p = {}; var o = this.options, p = {};
if (!this.popupView) { if (!this.popupView) {
return; return;
} }
var isVisible = this.popupView.isVisible(); var isVisible = this.popupView.isVisible();
this.popupView.visible(); this.popupView.visible();
var combo = BI.isNotNull(e) ? {
element: {
offset: function () {
return {
left: e.pageX,
top: e.pageY
};
},
bounds: function () {
// offset为其相对于父定位元素的偏移
return {
x: e.offsetX,
y: e.offsetY,
width: 0,
height: 24
};
},
outerWidth: function () {
return 0;
},
outerHeight: function () {
return 24;
}
}
} : this.combo;
switch (o.direction) { switch (o.direction) {
case "bottom": case "bottom":
case "bottom,right": case "bottom,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle);
break; break;
case "top": case "top":
case "top,right": case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle);
break; break;
case "left": case "left":
case "left,bottom": case "left,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle);
break; break;
case "right": case "right":
case "right,bottom": case "right,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle);
break; break;
case "top,left": case "top,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle);
break; break;
case "bottom,left": case "bottom,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle);
break; break;
case "left,top": case "left,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle);
break; break;
case "right,top": case "right,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle);
break; break;
case "top,custom": case "top,custom":
case "custom,top": case "custom,top":
p = $.getTopAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "custom,bottom": case "custom,bottom":
case "bottom,custom": case "bottom,custom":
p = $.getBottomAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getBottomAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "left,custom": case "left,custom":
case "custom,left": case "custom,left":
p = $.getLeftAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getLeftAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
case "custom,right": case "custom,right":
case "right,custom": case "right,custom":
p = $.getRightAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getRightAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
@ -26635,9 +26667,9 @@ BI.Combo = BI.inherit(BI.Widget, {
return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible(); return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible();
}, },
showView: function () { showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) { if (this.isEnabled() && this.combo.isEnabled()) {
this._popupView(); this._popupView(e);
} }
}, },
@ -43552,8 +43584,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {
@ -47928,8 +47960,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {

17
dist/fix/fix.js vendored
Unescape View File

@ -456,11 +456,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
ob.parent = parentObserver || ob.parent; if (ob) {
ob.parentKey = parentKey; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey;
}
return ob; return ob;
} }
@ -548,9 +550,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -573,7 +580,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/widget.js vendored
Unescape View File

@ -1882,8 +1882,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {
@ -6258,8 +6258,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {

63
src/base/combination/combo.js
Unescape View File

@ -288,13 +288,13 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
_popupView: function () { _popupView: function (e) {
this._assertPopupViewRender(); this._assertPopupViewRender();
this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
this.popupView.visible(); this.popupView.visible();
this.adjustWidth(); this.adjustWidth(e);
this.adjustHeight(); this.adjustHeight(e);
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
@ -302,7 +302,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },
adjustWidth: function () { adjustWidth: function (e) {
var o = this.options; var o = this.options;
if (!this.popupView) { if (!this.popupView) {
return; return;
@ -320,59 +320,84 @@ BI.Combo = BI.inherit(BI.Widget, {
} }
}, },
adjustHeight: function () { adjustHeight: function (e) {
var o = this.options, p = {}; var o = this.options, p = {};
if (!this.popupView) { if (!this.popupView) {
return; return;
} }
var isVisible = this.popupView.isVisible(); var isVisible = this.popupView.isVisible();
this.popupView.visible(); this.popupView.visible();
var combo = BI.isNotNull(e) ? {
element: {
offset: function () {
return {
left: e.pageX,
top: e.pageY
};
},
bounds: function () {
// offset为其相对于父定位元素的偏移
return {
x: e.offsetX,
y: e.offsetY,
width: 0,
height: 24
};
},
outerWidth: function () {
return 0;
},
outerHeight: function () {
return 24;
}
}
} : this.combo;
switch (o.direction) { switch (o.direction) {
case "bottom": case "bottom":
case "bottom,right": case "bottom,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle);
break; break;
case "top": case "top":
case "top,right": case "top,right":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle);
break; break;
case "left": case "left":
case "left,bottom": case "left,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle);
break; break;
case "right": case "right":
case "right,bottom": case "right,bottom":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle);
break; break;
case "top,left": case "top,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle);
break; break;
case "bottom,left": case "bottom,left":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle);
break; break;
case "left,top": case "left,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle);
break; break;
case "right,top": case "right,top":
p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle); p = $.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle);
break; break;
case "top,custom": case "top,custom":
case "custom,top": case "custom,top":
p = $.getTopAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "custom,bottom": case "custom,bottom":
case "bottom,custom": case "bottom,custom":
p = $.getBottomAdaptPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); p = $.getBottomAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);
break; break;
case "left,custom": case "left,custom":
case "custom,left": case "custom,left":
p = $.getLeftAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getLeftAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
case "custom,right": case "custom,right":
case "right,custom": case "right,custom":
p = $.getRightAdaptPosition(this.combo, this.popupView, o.adjustXOffset || o.adjustLength); p = $.getRightAdaptPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength);
delete p.top; delete p.top;
delete p.adaptHeight; delete p.adaptHeight;
break; break;
@ -443,9 +468,9 @@ BI.Combo = BI.inherit(BI.Widget, {
return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible(); return this.isEnabled() && this.combo.isEnabled() && !!this.popupView && this.popupView.isVisible();
}, },
showView: function () { showView: function (e) {
if (this.isEnabled() && this.combo.isEnabled()) { if (this.isEnabled() && this.combo.isEnabled()) {
this._popupView(); this._popupView(e);
} }
}, },

8
src/base/single/button/button.basic.js
Unescape View File

@ -285,7 +285,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
} }
}, },
_trigger: function () { _trigger: function (e) {
var o = this.options; var o = this.options;
if (!this.isEnabled()) { if (!this.isEnabled()) {
return; return;
@ -296,9 +296,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
this.setSelected(!this.isSelected())); this.setSelected(!this.isSelected()));
} }
if (this.isValid()) { if (this.isValid()) {
o.handler.call(this, this.getValue(), this); o.handler.call(this, this.getValue(), this, e);
var v = this.getValue(); var v = this.getValue();
this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this); this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this, e);
this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this); this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
if (o.action) { if (o.action) {
BI.Actions.runAction(o.action, "click", o); BI.Actions.runAction(o.action, "click", o);
@ -311,7 +311,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (this.isValid()) { if (this.isValid()) {
this.beforeClick(e); this.beforeClick(e);
} }
this._trigger(); this._trigger(e);
if (this.isValid()) { if (this.isValid()) {
this.doClick(e); this.doClick(e);
} }

4
src/widget/downlist/combo.downlist.js
Unescape View File

@ -69,8 +69,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {

4
src/widget/multilayerdownlist/combo.downlist.js
Unescape View File

@ -68,8 +68,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
this.downlistcombo.hideView(); this.downlistcombo.hideView();
}, },
showView: function () { showView: function (e) {
this.downlistcombo.showView(); this.downlistcombo.showView(e);
}, },
populate: function (items) { populate: function (items) {

Write Preview
Loading…
Cancel
Save