Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts:
#	dist/bundle.min.js
es6
windy 7 years ago
parent
commit
47ac527dfb
  1. 28
      dist/_fineui.min.js
  2. 8
      dist/bundle.js
  3. 28
      dist/fineui.min.js
  4. 2
      dist/fix/fix.compact.js
  5. 6
      dist/fix/fix.js
  6. 23
      src/core/config.js

28
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/bundle.js vendored

@ -34708,7 +34708,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
enumerable: true,
configurable: true,
get: function reactiveGetter() {
var value = val;
var value = childOb ? childOb.model : val;
if (Dep.target) {
dep.depend();
if (childOb) {
@ -34721,7 +34721,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return value;
},
set: function reactiveSetter(newVal) {
var value = val;
var value = childOb ? childOb.model : val;
if (newVal === value || newVal !== newVal && value !== value) {
return;
}
@ -35483,7 +35483,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
for (var i = 0, len = model.length; i < len; i++) {
result[i] = toJSON(model[i]);
}
} else if (isPlainObject(model)) {
} else if (model && isPlainObject(model)) {
result = {};
for (var _key4 in model) {
if (!_.has($$skipArray, _key4)) {
@ -111372,7 +111372,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
needPop = true;
}
this.store = this._store();
this.store._widget = this;
this.store && (this.store._widget = this);
needPop && popTarget();
needPop = false;
pushTarget(this.store);

28
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fix/fix.compact.js vendored

@ -115,7 +115,7 @@
needPop = true;
}
this.store = this._store();
this.store._widget = this;
this.store && (this.store._widget = this);
needPop && popTarget();
needPop = false;
pushTarget(this.store);

6
dist/fix/fix.js vendored

@ -548,7 +548,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
enumerable: true,
configurable: true,
get: function reactiveGetter() {
var value = val;
var value = childOb ? childOb.model : val;
if (Dep.target) {
dep.depend();
if (childOb) {
@ -561,7 +561,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return value;
},
set: function reactiveSetter(newVal) {
var value = val;
var value = childOb ? childOb.model : val;
if (newVal === value || newVal !== newVal && value !== value) {
return;
}
@ -1323,7 +1323,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
for (var i = 0, len = model.length; i < len; i++) {
result[i] = toJSON(model[i]);
}
} else if (isPlainObject(model)) {
} else if (model && isPlainObject(model)) {
result = {};
for (var _key4 in model) {
if (!_.has($$skipArray, _key4)) {

23
src/core/config.js

@ -3,21 +3,18 @@
// 注册布局
var isSupportFlex = BI.isSupportCss3("flex");
BI.Plugin.registerWidget("bi.horizontal", function (ob) {
if (isSupportFlex) {
if (!BI.isIE() && isSupportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return ob;
});
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
if (isSupportFlex && ob.items && ob.items.length <= 1) {
if (!BI.isIE() && isSupportFlex && ob.items && ob.items.length <= 1) {
// 有滚动条的情况下需要用到flex_wrapper_center布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend(ob, {type: "bi.flex_wrapper_center"});
}
return ob;
return BI.extend(ob, {type: "bi.flex_wrapper_center"});
}
return BI.extend(ob, {type: "bi.flex_center"});
}
@ -25,14 +22,11 @@
});
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) {
if (!BI.isIE() && isSupportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
}
return ob;
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center"});
}
@ -40,14 +34,11 @@
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (isSupportFlex) {
if (!BI.isIE() && isSupportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend({}, ob, {type: "bi.flex_wrapper_center"});
}
return ob;
return BI.extend({}, ob, {type: "bi.flex_wrapper_center"});
}
return BI.extend(ob, {type: "bi.flex_center"});
}

Loading…
Cancel
Save