Pull request #1778: 无JIAR任务 update

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

* commit '9b7224ca2e2184b08b726aa724e8bc79dfc34560':
  update
  update
  update

src/core/platform/web/config.js

@@ -26,14 +26,14 @@ BI.prepares.push(function () {
         if (!isIE && supportFlex) {
             return BI.extend({}, ob, {type: "bi.flex_horizontal"});
         }
-        // 解决使用inline_vertical_adapt的顺序问题
+        // // 解决使用inline_vertical_adapt的顺序问题
-        // 从右往左放置时，为了兼容，我们统一采用从右到左的放置方式
+        // // 从右往左放置时，为了兼容，我们统一采用从右到左的放置方式
-        if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
+        // if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
-            return BI.extend({verticalAlign: BI.VerticalAlign.Top}, ob, {
+        //     return BI.extend({verticalAlign: BI.VerticalAlign.Top}, ob, {
-                type: "bi.inline_vertical_adapt",
+        //         type: "bi.inline_vertical_adapt",
-                items: ob.items && ob.items.reverse()
+        //         items: ob.items && ob.items.reverse()
-            });
+        //     });
-        }
+        // }
         return BI.extend({}, ob, {type: "bi.table_adapt"});
     });
     BI.Plugin.configWidget("bi.center_adapt", function (ob) {
@@ -43,9 +43,6 @@ BI.prepares.push(function () {
             if (!isIE && supportFlex) {
                 return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
             }
-            if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
-                return BI.extend({}, ob, {type: "bi.inline_center_adapt", items: ob.items && ob.items.reverse()});
-            }
             return BI.extend({}, ob, {type: "bi.inline_center_adapt"});
         }
         return ob;
@@ -57,9 +54,6 @@ BI.prepares.push(function () {
             if (!isIE && supportFlex) {
                 return BI.extend({}, ob, {type: "bi.flex_vertical_center_adapt"});
             }
-            if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
-                return BI.extend({}, ob, {type: "bi.inline_vertical_adapt", items: ob.items && ob.items.reverse()});
-            }
             return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"});
         }
         return ob;

src/core/wrapper/layout/adapt/adapt.leftrightvertical.js

@@ -15,9 +15,15 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
             llgap: 0,
             lrgap: 0,
             lhgap: 0,
+            ltgap: 0,
+            lbgap: 0,
+            lvgap: 0,
             rlgap: 0,
             rrgap: 0,
-            rhgap: 0
+            rhgap: 0,
+            rtgap: 0,
+            rbgap: 0,
+            rvgap: 0
         });
     },
     render: function () {
@@ -30,11 +36,17 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
                 items: [{
                     el: {
                         type: "bi.vertical_adapt",
+                        ref: function (_ref) {
+                            self.left = _ref;
+                        },
                         height: "100%",
                         items: o.items.left,
                         hgap: o.lhgap,
                         lgap: o.llgap,
-                        rgap: o.lrgap
+                        rgap: o.lrgap,
+                        tgap: o.ltgap,
+                        bgap: o.lbgap,
+                        vgap: o.lvgap
                     }
                 }]
             });
@@ -45,12 +57,17 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
                 items: [{
                     el: {
                         type: "bi.vertical_adapt",
+                        ref: function (_ref) {
+                            self.right = _ref;
+                        },
                         height: "100%",
                         items: o.items.right,
-                        textAlign: "right",
                         hgap: o.rhgap,
                         lgap: o.rlgap,
-                        rgap: o.rrgap
+                        rgap: o.rrgap,
+                        tgap: o.rtgap,
+                        bgap: o.rbgap,
+                        vgap: o.rvgap
                     }
                 }]
             });
@@ -68,8 +85,8 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
     },
 
     populate: function (items) {
-        BI.LeftRightVerticalAdaptLayout.superclass.populate.apply(this, arguments);
+        this.left.populate(items.left);
-        this._mount();
+        this.right.populate(items.right);
     }
 });
 BI.shortcut("bi.left_right_vertical_adapt", BI.LeftRightVerticalAdaptLayout);
@@ -82,27 +99,30 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
             items: [],
             lgap: 0,
             rgap: 0,
-            hgap: 0
+            hgap: 0,
+            tgap: 0,
+            bgap: 0,
+            vgap: 0
         });
     },
     render: function () {
         var o = this.options, self = this;
         BI.LeftVerticalAdaptLayout.superclass.render.apply(this, arguments);
         return {
-            type: "bi.left",
+            type: "bi.vertical_adapt",
             ref: function (_ref) {
                 self.layout = _ref;
             },
-            items: [{
-                el: {
-                    type: "bi.vertical_adapt",
-                    height: "100%",
             items: o.items,
-                    lgap: o.lgap,
             hgap: o.hgap,
-                    rgap: o.rgap
+            lgap: o.lgap,
-                }
+            rgap: o.rgap,
-            }]
+            tgap: o.tgap,
+            bgap: o.bgap,
+            vgap: o.vgap,
+            scrollx: o.scrollx,
+            scrolly: o.scrolly,
+            scrollable: o.scrollable
         };
     },
 
@@ -128,28 +148,31 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
             items: [],
             lgap: 0,
             rgap: 0,
-            hgap: 0
+            hgap: 0,
+            tgap: 0,
+            bgap: 0,
+            vgap: 0
         });
     },
     render: function () {
         var o = this.options, self = this;
         BI.RightVerticalAdaptLayout.superclass.render.apply(this, arguments);
         return {
-            type: "bi.right",
+            type: "bi.vertical_adapt",
             ref: function (_ref) {
                 self.layout = _ref;
             },
-            items: [{
+            horizontalAlign: BI.HorizontalAlign.Right,
-                el: {
-                    type: "bi.vertical_adapt",
-                    height: "100%",
-                    textAlign: "right",
             items: o.items,
-                    lgap: o.lgap,
             hgap: o.hgap,
-                    rgap: o.rgap
+            lgap: o.lgap,
-                }
+            rgap: o.rgap,
-            }]
+            tgap: o.tgap,
+            bgap: o.bgap,
+            vgap: o.vgap,
+            scrollx: o.scrollx,
+            scrolly: o.scrolly,
+            scrollable: o.scrollable
         };
     },
 
@@ -163,7 +186,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
     },
 
     populate: function (items) {
-        this.layout.populate.apply(this, arguments);
+        this.layout.populate(items);
     }
 });
 BI.shortcut("bi.right_vertical_adapt", BI.RightVerticalAdaptLayout);

src/less/core/wrapper/flex.horizontal.less

@@ -105,18 +105,21 @@
     -webkit-justify-content: center;
     -moz-justify-content: center;
     -ms-justify-content: center;
-    -o-justify-content: center;
     -ms-flex-pack: center;
+    -o-justify-content: center;
     justify-content: center;
   }
 
   &.h-right {
+    /* 09版 */
+    -webkit-box-pack: flex-end;
     /* 12版 */
-    -webkit-flex-direction: row-reverse;
+    -webkit-justify-content: flex-end;
-    -moz-flex-direction: row-reverse;
+    -moz-justify-content: flex-end;
-    -ms-flex-direction: row-reverse;
+    -ms-justify-content: flex-end;
-    -o-flex-direction: row-reverse;
+    -ms-flex-pack: end;
-    flex-direction: row-reverse;
+    -o-justify-content: flex-end;
+    justify-content: flex-end;
   }
 
   > .shrink-none {

src/less/core/wrapper/flex.vertical.less

@@ -104,18 +104,21 @@
     -webkit-justify-content: center;
     -moz-justify-content: center;
     -ms-justify-content: center;
-    -o-justify-content: center;
     -ms-flex-pack: center;
+    -o-justify-content: center;
     justify-content: center;
   }
 
   &.v-bottom {
+    /* 09版 */
+    -webkit-box-pack: flex-end;
     /* 12版 */
-    -webkit-flex-direction: column-reverse;
+    -webkit-justify-content: flex-end;
-    -moz-flex-direction: column-reverse;
+    -moz-justify-content: flex-end;
-    -ms-flex-direction: column-reverse;
+    -ms-justify-content: flex-end;
-    -o-flex-direction: column-reverse;
+    -ms-flex-pack: end;
-    flex-direction: column-reverse;
+    -o-justify-content: flex-end;
+    justify-content: flex-end;
   }
 
   > .shrink-none {

src/less/core/wrapper/flex.wrapper.horizontal.less

@@ -118,12 +118,15 @@
     }
 
     &.h-right {
+      /* 09版 */
+      -webkit-box-pack: flex-end;
       /* 12版 */
-      -webkit-flex-direction: row-reverse;
+      -webkit-justify-content: flex-end;
-      -moz-flex-direction: row-reverse;
+      -moz-justify-content: flex-end;
-      -ms-flex-direction: row-reverse;
+      -ms-justify-content: flex-end;
-      -o-flex-direction: row-reverse;
+      -ms-flex-pack: end;
-      flex-direction: row-reverse;
+      -o-justify-content: flex-end;
+      justify-content: flex-end;
     }
 
     > .shrink-none {

src/less/core/wrapper/flex.wrapper.vertical.less

@@ -118,12 +118,15 @@
     }
 
     &.v-bottom {
+      /* 09版 */
+      -webkit-box-pack: flex-end;
       /* 12版 */
-      -webkit-flex-direction: column-reverse;
+      -webkit-justify-content: flex-end;
-      -moz-flex-direction: column-reverse;
+      -moz-justify-content: flex-end;
-      -ms-flex-direction: column-reverse;
+      -ms-justify-content: flex-end;
-      -o-flex-direction: column-reverse;
+      -ms-flex-pack: end;
-      flex-direction: column-reverse;
+      -o-justify-content: flex-end;
+      justify-content: flex-end;
     }
 
     > .shrink-none {