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

Merge pull request #866 in VISUAL/fineui from ~GUY/fineui:master to master 

* commit 'd6db584cb5c5aa7e26f6d94437658459010526e5':
  布局
  布局
es6
guy 6 years ago
parent
b4109f0235 d6db584cb5
commit
2d5b64c9f4
18 changed files with 541 additions and 253 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      dist/2.0/fineui.ie.js
  2. 70
      dist/2.0/fineui.ie.min.js
  3. 46
      dist/2.0/fineui.js
  4. 70
      dist/2.0/fineui.min.js
  5. 46
      dist/bundle.ie.js
  6. 70
      dist/bundle.ie.min.js
  7. 46
      dist/bundle.js
  8. 70
      dist/bundle.min.js
  9. 46
      dist/core.js
  10. 46
      dist/fineui.ie.js
  11. 70
      dist/fineui.ie.min.js
  12. 46
      dist/fineui.js
  13. 70
      dist/fineui.min.js
  14. 4
      dist/fineui_without_jquery_polyfill.js
  15. 2
      dist/utils.min.js
  16. 42
      src/core/platform/web/config.js
  17. 2
      src/core/wrapper/layout/flex/flex.horizontal.center.js
  18. 2
      src/core/wrapper/layout/flex/flex.vertical.center.js

46
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -19147,8 +19147,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19166,7 +19166,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19201,6 +19201,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31375,7 +31411,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31504,7 +31540,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

70
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/2.0/fineui.js vendored
Unescape View File

@ -19147,8 +19147,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19166,7 +19166,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19201,6 +19201,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31375,7 +31411,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31504,7 +31540,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

70
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/bundle.ie.js vendored
Unescape View File

@ -19147,8 +19147,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19166,7 +19166,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19201,6 +19201,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31375,7 +31411,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31504,7 +31540,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

70
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/bundle.js vendored
Unescape View File

@ -19147,8 +19147,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19166,7 +19166,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19201,6 +19201,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31375,7 +31411,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31504,7 +31540,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

70
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/core.js vendored
Unescape View File

@ -19147,8 +19147,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19166,7 +19166,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19201,6 +19201,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31375,7 +31411,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31504,7 +31540,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

46
dist/fineui.ie.js vendored
Unescape View File

@ -19392,8 +19392,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19411,7 +19411,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19446,6 +19446,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31620,7 +31656,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31749,7 +31785,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

70
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/fineui.js vendored
Unescape View File

@ -19392,8 +19392,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -19411,7 +19411,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -19446,6 +19446,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});
@ -31620,7 +31656,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -31749,7 +31785,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

70
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -20301,7 +20301,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
@ -20430,7 +20430,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

42
src/core/platform/web/config.js
Unescape View File

@ -36,8 +36,8 @@ BI.prepares.push(function () {
}
return BI.extend(ob, {type: "bi.table_adapt"});
}
if(!isIE) {
if(supportFlex) {
if (!isIE) {
if (supportFlex) {
return BI.extend(ob, {type: "bi.flex_horizontal"});
}
return BI.extend(ob, {type: "bi.table_adapt"});
@ -55,7 +55,7 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
// 一个item的情况下inline布局睥睨天下
if(justOneItem) {
if (justOneItem) {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
}
return ob;
@ -90,6 +90,42 @@ BI.prepares.push(function () {
return BI.extend(ob, {type: "bi.inline_center_adapt"});
});
BI.Plugin.registerWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_horizontal_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_horizontal_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_vertical_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_adapt"});
}
});
BI.Plugin.registerWidget("bi.flex_center_adapt", function (ob) {
if (ob.scrollable === true || ob.scrolly === true || ob.scrollx === true) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
});
BI.Plugin.registerWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
return BI.extend(ob, {type: "bi.image_radio"});

2
src/core/wrapper/layout/flex/flex.horizontal.center.js
Unescape View File

@ -47,7 +47,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);

2
src/core/wrapper/layout/flex/flex.vertical.center.js
Unescape View File

@ -48,7 +48,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
},
populate: function (items) {
self.populate(items);
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);

Write Preview
Loading…
Cancel
Save