Browse Source

Pull request #2536: 无JIRA任务 feature: items和value支持自动watch

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '4b64392b7aa803c985eb225345fd52c8d817bc8c':
  feature: items和value支持自动watch
es6
guy 3 years ago
parent
commit
1f8da0b031
  1. 6
      src/base/collection/collection.js
  2. 6
      src/base/grid/grid.js

6
src/base/collection/collection.js

@ -54,14 +54,14 @@ BI.CollectionView = BI.inherit(BI.Widget, {
}); });
// 兼容一下 // 兼容一下
var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly; var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly;
if (overflowX === false) { if (o.overflowX === false) {
if (overflowY === false) { if (o.overflowY === false) {
scrollable = false; scrollable = false;
} else { } else {
scrollable = "y" scrollable = "y"
} }
} else { } else {
if (overflowY === false) { if (o.overflowY === false) {
scrollable = "x"; scrollable = "x";
} }
} }

6
src/base/grid/grid.js

@ -57,14 +57,14 @@ BI.GridView = BI.inherit(BI.Widget, {
}); });
// 兼容一下 // 兼容一下
var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly; var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly;
if (overflowX === false) { if (o.overflowX === false) {
if (overflowY === false) { if (o.overflowY === false) {
scrollable = false; scrollable = false;
} else { } else {
scrollable = "y" scrollable = "y"
} }
} else { } else {
if (overflowY === false) { if (o.overflowY === false) {
scrollable = "x"; scrollable = "x";
} }
} }

Loading…
Cancel
Save