diff --git a/src/core/shortcut.js b/src/core/shortcut.js index 001a73b8cc..f160ce95f7 100644 --- a/src/core/shortcut.js +++ b/src/core/shortcut.js @@ -60,7 +60,7 @@ BI.Plugin.getObject(el.type, this); } }]); - return w.type === el.type ? createWidget(w, context, lazy) : BI.createWidget(BI.extend({}, item, {type: w.type}), options, context, lazy); + return w.type === el.type ? createWidget(w, context, lazy) : BI.createWidget(BI.extend({/**important**/}, el, {type: w.type}), options, context, lazy); } if (item.el && (item.el.type || options.type)) { el = BI.extend({}, options, item.el); @@ -71,7 +71,7 @@ BI.Plugin.getObject(el.type, this); } }]); - return w.type === el.type ? createWidget(w, context, lazy) : BI.createWidget(BI.extend({}, item, {type: w.type}), options, context, lazy); + return w.type === el.type ? createWidget(w, context, lazy) : BI.createWidget(BI.extend({/**important**/}, el, {type: w.type}), options, context, lazy); } if (BI.isWidget(item.el)) { return item.el; diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 1e0d0e35d7..d5036ed19f 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -54,6 +54,11 @@ -ms-align-items: center; -o-align-items: center; align-items: center; + + &.h-center { + min-width: 100%; + float: left; + } } &.v-bottom { @@ -101,13 +106,14 @@ &.h-stretch { /* 09版 */ - -webkit-box-orient: vertical; + -webkit-box-align: stretch; /* 12版 */ - -webkit-flex-direction: column; - -moz-flex-direction: column; - -ms-flex-direction: column; - -o-flex-direction: column; - flex-direction: column; + -webkit-align-items: stretch; + -moz-align-items: stretch; + -ms-align-items: stretch; + -ms-flex-align: stretch; + -o-align-items: stretch; + align-items: stretch; &.v-middle { /* 09版 */ @@ -132,19 +138,6 @@ -o-justify-content: flex-end; justify-content: flex-end; } - - &.v-stretch { - } - - /* 09版 */ - -webkit-box-align: stretch; - /* 12版 */ - -webkit-align-items: stretch; - -moz-align-items: stretch; - -ms-align-items: stretch; - -ms-flex-align: stretch; - -o-align-items: stretch; - align-items: stretch; } } } diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index 569f2893b9..749701485e 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -55,6 +55,11 @@ -ms-flex-align: center; -o-align-items: center; align-items: center; + + &.v-middle { + min-height: 100%; + float: left; + } } &.h-right { @@ -104,13 +109,14 @@ &.v-stretch { /* 09版 */ - -webkit-box-orient: horizontal; + -webkit-box-align: stretch; /* 12版 */ - -webkit-flex-direction: row; - -moz-flex-direction: row; - -ms-flex-direction: row; - -o-flex-direction: row; - flex-direction: row; + -webkit-align-items: stretch; + -moz-align-items: stretch; + -ms-align-items: stretch; + -ms-flex-align: stretch; + -o-align-items: stretch; + align-items: stretch; &.h-center { /* 09版 */ @@ -135,19 +141,6 @@ -o-justify-content: flex-end; justify-content: flex-end; } - - &.h-stretch { - } - - /* 09版 */ - -webkit-box-align: stretch; - /* 12版 */ - -webkit-align-items: stretch; - -moz-align-items: stretch; - -ms-align-items: stretch; - -ms-flex-align: stretch; - -o-align-items: stretch; - align-items: stretch; } } }