Merging in latest from upstream (VISUAL/fineui:refs/heads/master)

* commit '17afd326793d48ff65175a9990dee4b76ea16110': (52 commits)
  auto upgrade version to 2.0.20210406122155
  无JIRA任务 fix：this指向问题
  auto upgrade version to 2.0.20210404210234
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  布局大一统
  auto upgrade version to 2.0.20210402170231
  auto upgrade version to 2.0.20210402162812
  生命周期严格按照beforemount render mounted的顺序执行
  auto upgrade version to 2.0.20210402155224
  ...

dist/fix/fix.compact.ie.js

@@ -163,76 +163,76 @@
         needPop && popTarget();
     };
 
-    BI.Widget.prototype._initElement = function () {
-        var self = this;
-        var render = BI.isFunction(this.options.render) ? this.options.render : this.render;
-        var els;
-        if (this.options.updateMode === "auto" && this._store) {
-            // 自动更新模式
-            var childComponents = {};
-            var rendered = false;
-            this._watchers.push(Fix.watch(this.model, function () {
-                if (rendered) {
-                    var newEls = render && render.call(this);
-                    BI.each(childComponents, function (i, childComponent) {
-                        if (childComponent.component instanceof BI.Layout) {
-                            return; // 布局的过滤掉
-                        }
-                        var nextProps = BI.get([newEls], childComponent.path);
-                        if (nextProps) {
-                            var shouldUpdate = childComponent.component.shouldUpdate && childComponent.component.shouldUpdate(nextProps);
-                            childComponent.component._update(nextProps, shouldUpdate);
-                            childComponent.props = BI.extend(childComponent.props, nextProps);
-                        }
-                    });
-                } else {
-                    els = render && render.call(this);
-
-                    function traverse (parent, path) {
-                        BI.each(parent, function (i, child) {
-                            var childPath = path.concat(i);
-                            if (BI.isArray(child)) {
-                                traverse(child, childPath);
-                            } else if (BI.isPlainObject(child)) {
-                                if (child.type) {
-                                    child.__ref = function (_ref) {
-                                        if (_ref) {
-                                            var comp = childComponents[this.getName()] = {};
-                                            comp.component = _ref;
-                                            comp.props = child;
-                                            comp.path = childPath;
-                                        } else {
-                                            delete childComponents[this.getName()];
-                                        }
-                                    };
-                                }
-                                traverse(child, childPath);
-                            }
-                        });
-                    }
-
-                    traverse([els], []);
-                    rendered = true;
-                }
-            }));
-        } else {
-            els = render && render.call(this);
-        }
-        if (BI.isPlainObject(els)) {
-            els = [els];
-        }
-        if (BI.isArray(els)) {
-            BI.each(els, function (i, el) {
-                if (el) {
-                    BI._lazyCreateWidget(el, {
-                        element: self
-                    });
-                }
-            });
-        }
-        // if (this._isRoot === true || !(this instanceof BI.Layout)) {
-        this._mount();
-    };
+    // BI.Widget.prototype._initElement = function () {
+    //     var self = this;
+    //     var render = BI.isFunction(this.options.render) ? this.options.render : this.render;
+    //     var els;
+    //     if (this.options.updateMode === "auto" && this._store) {
+    //         // 自动更新模式
+    //         var childComponents = {};
+    //         var rendered = false;
+    //         this._watchers.push(Fix.watch(this.model, function () {
+    //             if (rendered) {
+    //                 var newEls = render && render.call(this);
+    //                 BI.each(childComponents, function (i, childComponent) {
+    //                     if (childComponent.component instanceof BI.Layout) {
+    //                         return; // 布局的过滤掉
+    //                     }
+    //                     var nextProps = BI.get([newEls], childComponent.path);
+    //                     if (nextProps) {
+    //                         var shouldUpdate = childComponent.component.shouldUpdate && childComponent.component.shouldUpdate(nextProps);
+    //                         childComponent.component._update(nextProps, shouldUpdate);
+    //                         childComponent.props = BI.extend(childComponent.props, nextProps);
+    //                     }
+    //                 });
+    //             } else {
+    //                 els = render && render.call(this);
+    //
+    //                 function traverse (parent, path) {
+    //                     BI.each(parent, function (i, child) {
+    //                         var childPath = path.concat(i);
+    //                         if (BI.isArray(child)) {
+    //                             traverse(child, childPath);
+    //                         } else if (BI.isPlainObject(child)) {
+    //                             if (child.type) {
+    //                                 child.__ref = function (_ref) {
+    //                                     if (_ref) {
+    //                                         var comp = childComponents[this.getName()] = {};
+    //                                         comp.component = _ref;
+    //                                         comp.props = child;
+    //                                         comp.path = childPath;
+    //                                     } else {
+    //                                         delete childComponents[this.getName()];
+    //                                     }
+    //                                 };
+    //                             }
+    //                             traverse(child, childPath);
+    //                         }
+    //                     });
+    //                 }
+    //
+    //                 traverse([els], []);
+    //                 rendered = true;
+    //             }
+    //         }));
+    //     } else {
+    //         els = render && render.call(this);
+    //     }
+    //     if (BI.isPlainObject(els)) {
+    //         els = [els];
+    //     }
+    //     if (BI.isArray(els)) {
+    //         BI.each(els, function (i, el) {
+    //             if (el) {
+    //                 BI._lazyCreateWidget(el, {
+    //                     element: self
+    //                 });
+    //             }
+    //         });
+    //     }
+    //     // if (this._isRoot === true || !(this instanceof BI.Layout)) {
+    //     this._mount();
+    // };
 
     var unMount = BI.Widget.prototype.__d;
     BI.Widget.prototype.__d = function () {

dist/fix/fix.compact.js

@@ -163,76 +163,76 @@
         needPop && popTarget();
     };
 
-    BI.Widget.prototype._initElement = function () {
-        var self = this;
-        var render = BI.isFunction(this.options.render) ? this.options.render : this.render;
-        var els;
-        if (this.options.updateMode === "auto" && this._store) {
-            // 自动更新模式
-            var childComponents = {};
-            var rendered = false;
-            this._watchers.push(Fix.watch(this.model, function () {
-                if (rendered) {
-                    var newEls = render && render.call(this);
-                    BI.each(childComponents, function (i, childComponent) {
-                        if (childComponent.component instanceof BI.Layout) {
-                            return; // 布局的过滤掉
-                        }
-                        var nextProps = BI.get([newEls], childComponent.path);
-                        if (nextProps) {
-                            var shouldUpdate = childComponent.component.shouldUpdate && childComponent.component.shouldUpdate(nextProps);
-                            childComponent.component._update(nextProps, shouldUpdate);
-                            childComponent.props = BI.extend(childComponent.props, nextProps);
-                        }
-                    });
-                } else {
-                    els = render && render.call(this);
-
-                    function traverse (parent, path) {
-                        BI.each(parent, function (i, child) {
-                            var childPath = path.concat(i);
-                            if (BI.isArray(child)) {
-                                traverse(child, childPath);
-                            } else if (BI.isPlainObject(child)) {
-                                if (child.type) {
-                                    child.__ref = function (_ref) {
-                                        if (_ref) {
-                                            var comp = childComponents[this.getName()] = {};
-                                            comp.component = _ref;
-                                            comp.props = child;
-                                            comp.path = childPath;
-                                        } else {
-                                            delete childComponents[this.getName()];
-                                        }
-                                    };
-                                }
-                                traverse(child, childPath);
-                            }
-                        });
-                    }
-
-                    traverse([els], []);
-                    rendered = true;
-                }
-            }));
-        } else {
-            els = render && render.call(this);
-        }
-        if (BI.isPlainObject(els)) {
-            els = [els];
-        }
-        if (BI.isArray(els)) {
-            BI.each(els, function (i, el) {
-                if (el) {
-                    BI._lazyCreateWidget(el, {
-                        element: self
-                    });
-                }
-            });
-        }
-        // if (this._isRoot === true || !(this instanceof BI.Layout)) {
-        this._mount();
-    };
+    // BI.Widget.prototype._initElement = function () {
+    //     var self = this;
+    //     var render = BI.isFunction(this.options.render) ? this.options.render : this.render;
+    //     var els;
+    //     if (this.options.updateMode === "auto" && this._store) {
+    //         // 自动更新模式
+    //         var childComponents = {};
+    //         var rendered = false;
+    //         this._watchers.push(Fix.watch(this.model, function () {
+    //             if (rendered) {
+    //                 var newEls = render && render.call(this);
+    //                 BI.each(childComponents, function (i, childComponent) {
+    //                     if (childComponent.component instanceof BI.Layout) {
+    //                         return; // 布局的过滤掉
+    //                     }
+    //                     var nextProps = BI.get([newEls], childComponent.path);
+    //                     if (nextProps) {
+    //                         var shouldUpdate = childComponent.component.shouldUpdate && childComponent.component.shouldUpdate(nextProps);
+    //                         childComponent.component._update(nextProps, shouldUpdate);
+    //                         childComponent.props = BI.extend(childComponent.props, nextProps);
+    //                     }
+    //                 });
+    //             } else {
+    //                 els = render && render.call(this);
+    //
+    //                 function traverse (parent, path) {
+    //                     BI.each(parent, function (i, child) {
+    //                         var childPath = path.concat(i);
+    //                         if (BI.isArray(child)) {
+    //                             traverse(child, childPath);
+    //                         } else if (BI.isPlainObject(child)) {
+    //                             if (child.type) {
+    //                                 child.__ref = function (_ref) {
+    //                                     if (_ref) {
+    //                                         var comp = childComponents[this.getName()] = {};
+    //                                         comp.component = _ref;
+    //                                         comp.props = child;
+    //                                         comp.path = childPath;
+    //                                     } else {
+    //                                         delete childComponents[this.getName()];
+    //                                     }
+    //                                 };
+    //                             }
+    //                             traverse(child, childPath);
+    //                         }
+    //                     });
+    //                 }
+    //
+    //                 traverse([els], []);
+    //                 rendered = true;
+    //             }
+    //         }));
+    //     } else {
+    //         els = render && render.call(this);
+    //     }
+    //     if (BI.isPlainObject(els)) {
+    //         els = [els];
+    //     }
+    //     if (BI.isArray(els)) {
+    //         BI.each(els, function (i, el) {
+    //             if (el) {
+    //                 BI._lazyCreateWidget(el, {
+    //                     element: self
+    //                 });
+    //             }
+    //         });
+    //     }
+    //     // if (this._isRoot === true || !(this instanceof BI.Layout)) {
+    //     this._mount();
+    // };
 
     var unMount = BI.Widget.prototype.__d;
     BI.Widget.prototype.__d = function () {

dist/lib/base/single/button/buttons/button.image.d.ts

@@ -2,13 +2,10 @@ import { BasicButton } from "../button.basic";
 export declare class ImageButton extends BasicButton {
     static xtype: string;
     static EVENT_CHANGE: string;
-    setWidth(w: number): void;
-    setHeight(h: number): void;
-    setImageWidth(w: number): void;
-    setImageHeight(h: number): void;
+    setImageWidth(w: number | string): void;
+    setImageHeight(h: number | string): void;
     getImageWidth(): number;
     getImageHeight(): number;
     setSrc(src: string): void;
     getSrc(): string;
-    doClick(): void;
 }

dist/lib/core/widget.d.ts

@@ -483,11 +483,11 @@ export declare class Widget extends OB {
     /**
      * 设置宽度
      */
-    setWidth(w: number): void;
+    setWidth(w: number | string): void;
     /**
      * 设置高度
      */
-    setHeight(h: number): void;
+    setHeight(h: number | string): void;
     /**
      * 设置可用
      */

dist/lib/core/wrapper/layout/adapt/float.horizontal.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from "../../layout";
+export declare class FloatHorizontalLayout extends Layout {
+    static xtype: string;
+}

dist/lib/index.d.ts

@@ -154,6 +154,7 @@ import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup
 import { ImageButton } from './base/single/button/buttons/button.image';
 import { History, Router } from "./router/router";
 import { DateTimeCombo } from './widget/datetime/datetime.combo';
+import { FloatHorizontalLayout } from "./core/wrapper/layout/adapt/float.horizontal";
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     OB: typeof OB;
     Plugin: _Plugin;
@@ -312,9 +313,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Router: typeof Router;
     history: History;
     DateTimeCombo: typeof DateTimeCombo;
+    FloatHorizontalLayout: typeof FloatHorizontalLayout;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, };
+export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, };

karma.conf.js

@@ -20,36 +20,9 @@ module.exports = function (config) {
         // list of files / patterns to load in the browser
         files: [
             "dist/fineui.min.css",
-            "src/core/foundation.js",
-            "src/core/lodash.js",
-            "src/core/base.js",
-            "i18n/i18n.cn.js",
-            "src/core/ob.js",
-            "src/core/widget.js",
-            "src/core/shortcut.js",
-            "src/core/utils/**/*.js",
-            "src/core/behavior/behavior.js",
-            "src/core/wrapper/layout.js",
-            "src/core/plugin.js",
             "src/core/**/*.js",
             "src/data/**/*.js",
-            "src/data/**/*.js",
-            "src/data/**/*.js",
             "src/third/**/*.js",
-            "src/base/pane.js",
-            "src/base/single/single.js",
-            "src/base/single/text.js",
-            "src/base/single/button/button.basic.js",
-            "src/base/single/button/button.node.js",
-            "src/base/single/tip/tip.js",
-            "src/base/combination/group.button.js",
-            "src/base/combination/tree.button.js",
-            "src/base/tree/ztree/treeview.js",
-            "src/base/tree/ztree/asynctree.js",
-            "src/base/tree/ztree/parttree.js",
-            "src/base/tree/ztree/list/listtreeview.js",
-            "src/base/tree/ztree/list/listasynctree.js",
-            "src/base/tree/ztree/list/listparttree.js",
             "src/base/**/*.js",
             "src/case/**/*.js",
             "src/widget/**/*.js",
@@ -61,12 +34,9 @@ module.exports = function (config) {
         ],
 
         exclude: [
-            "src/base/tree/ztree/jquery.ztree.core-3.5.js",
-            "src/base/tree/ztree/jquery.ztree.excheck-3.5.js",
             "src/base/single/input/file.js",
             "src/case/loading/loading_pane.js",
-            "src/base/tree/ztree/**/*.js",
-            "src/case/tree/ztree/*.js",
+            "src/case/ztree/**/*.js",
             "src/widget/multitree/**/*.js",
             "src/widget/multiselecttree/**/*.js",
             "src/component/treevaluechooser/*.js"
@@ -76,9 +46,8 @@ module.exports = function (config) {
         // preprocess matching files before serving them to the browser
         // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
         preprocessors: {
-            "src/core/alias.js": "coverage",
-            "src/core/base.js": "coverage",
-            "src/core/func/date.js": "coverage",
+            "src/core/1.base.js": "coverage",
+            "src/core/func/**/*.js": "coverage",
             "src/base/**/!(*.test).js": "coverage",
             "src/case/**/!(*.test).js": "coverage",
             "src/widget/**/!(*.test).js": "coverage",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20210329115159",
+  "version": "2.0.20210406122155",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

private/less/size.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/size";
-@import "var";

public/less/size.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/size";
-@import "var";

src/base/single/label/abstract.label.js

@@ -83,7 +83,7 @@
                     });
                     return;
                 }
-                if (o.whiteSpace == "normal") { // 1.3
+                if (o.whiteSpace === "normal") { // 1.3
                     BI.extend(json, {
                         hgap: o.hgap,
                         vgap: o.vgap,
@@ -152,7 +152,7 @@
                 });
                 return;
             }
-            if (o.whiteSpace == "normal") { // 1.7
+            if (o.whiteSpace === "normal") { // 1.7
                 BI.extend(json, {
                     hgap: o.hgap,
                     vgap: o.vgap,

src/core/4.widget.js

@@ -7,7 +7,7 @@
  */
 
 !(function () {
-    function callLifeHook(self, life) {
+    function callLifeHook (self, life) {
         var hook = self.options[life] || self[life];
         if (hook) {
             var hooks = BI.isArray(hook) ? hook : [hook];
@@ -98,8 +98,9 @@
         _initRender: function () {
             var self = this;
 
-            function render() {
+            function render () {
                 if (self.options.beforeRender || self.beforeRender) {
+                    self.__async = true;
                     (self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
                 } else {
                     self._render();
@@ -109,9 +110,6 @@
             if (this.options.beforeInit || this.beforeInit) {
                 this.__asking = true;
                 (this.options.beforeInit || this.beforeInit).call(this, render);
-                if (this.__asking === true) {
-                    this.__async = true;
-                }
             } else {
                 render();
             }
@@ -123,6 +121,7 @@
             this._initElement();
             this._initEffects();
             callLifeHook(this, "created");
+            this.__async = false;
         },
 
         _initCurrent: function () {
@@ -204,6 +203,8 @@
 
         _initElement: function () {
             var self = this;
+            var isMounted = this._isMounted;
+            this.__async === true && isMounted && callLifeHook(this, "beforeMount");
             var render = BI.isFunction(this.options.render) ? this.options.render : this.render;
             var els = render && render.call(this);
             if (BI.isPlainObject(els)) {
@@ -218,9 +219,12 @@
                     }
                 });
             }
-            // if (this._isRoot === true || !(this instanceof BI.Layout)) {
             this._mount();
-            // }
+
+            if (this.__async === true && isMounted) {
+                callLifeHook(this, "mounted");
+                this.fireEvent(BI.Events.MOUNT);
+            }
         },
 
         _setParent: function (parent) {
@@ -242,7 +246,7 @@
                 return false;
             }
             layer = layer || 0;
-            lifeHook !== false && callLifeHook(this, "beforeMount");
+            lifeHook !== false && !this.__async && callLifeHook(this, "beforeMount");
             this._isMounted = true;
             for (var key in this._children) {
                 var child = this._children[key];
@@ -266,8 +270,10 @@
                     var child = this._children[key];
                     child.__afterMount && child.__afterMount(lifeHook, predicate);
                 }
-                lifeHook !== false && callLifeHook(this, "mounted");
-                this.fireEvent(BI.Events.MOUNT);
+                if (lifeHook !== false && !this.__async) {
+                    callLifeHook(this, "mounted");
+                    this.fireEvent(BI.Events.MOUNT);
+                }
                 predicate && predicate(this);
             }
         },
@@ -593,12 +599,12 @@
         BI.Widget.context = context = contextStack.pop();
     };
 
-    function pushTarget(_current) {
+    function pushTarget (_current) {
         if (current) currentStack.push(current);
         BI.Widget.current = current = _current;
     }
 
-    function popTarget() {
+    function popTarget () {
         BI.Widget.current = current = currentStack.pop();
     }
 

src/core/platform/web/config.js

@@ -14,13 +14,9 @@ BI.prepares.push(function () {
         return _isSupportFlex;
     };
     BI.Plugin.configWidget("bi.horizontal", function (ob) {
-        var isIE = BI.isIE(), supportFlex = isSupportFlex(), isLessIE8 = isIE && BI.getIEVersion() < 8;
-        if (isLessIE8) {
-            return ob;
-        }
         // 在横向自适应场景下我们需要使用table的自适应撑出滚动条的特性（flex处理不了这种情况）
         // 主要出现在center_adapt或者horizontal_adapt的场景，或者主动设置horizontalAlign的场景
-        if (ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch) {
+        // if (ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch) {
             // 虽然有两个元素以上的时候，有场景是控制一个显示一个隐藏的效果，还无法通过flex来实现
             // var justOneItem = (ob.items && ob.items.length <= 1);
             // // 在这种情况下，也可以通过flex支持该布局
@@ -42,9 +38,9 @@ BI.prepares.push(function () {
             //             ? BI.HorizontalAlign.Left : ob.horizontalAlign
             //     });
             // }
-            return BI.extend({}, ob, {type: "bi.table_adapt"});
-        }
-        if (supportFlex) {
+            // return BI.extend({}, ob, {type: "bi.table_adapt"});
+        // }
+        if (isSupportFlex()) {
             // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
             // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
             return BI.extend({}, ob, {type: "bi.flex_horizontal"});
@@ -56,41 +52,42 @@ BI.prepares.push(function () {
         //         type: "bi.inline"
         //     });
         // }
+        return BI.extend({}, ob, {type: "bi.inline"});
         // 否则采用table，不过horizontalAlign的right就不支持了。
-        return BI.extend({}, ob, {type: "bi.table_adapt"});
-    });
-    BI.Plugin.configWidget("bi.center_adapt", function (ob) {
-        var supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
-        var isAdapt = !ob.horizontalAlign || ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch;
-        if (!isAdapt || justOneItem) {
-            if (supportFlex) {
-                // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-                // if (!isIE || (ob.scrollable !== true && ob.scrollx !== true && ob.scrolly !== true)) {
-                return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
-                // }
-            }
-            if (!BI.isIE() || BI.getIEVersion() > 8) {
-                return BI.extend({}, ob, {type: "bi.inline_center_adapt"});
-            }
-        }
-        return ob;
-    });
-    BI.Plugin.configWidget("bi.vertical_adapt", function (ob) {
-        var supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
-        var isAdapt = ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch;
-        if (!isAdapt || justOneItem) {
-            if (supportFlex) {
-                // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-                // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
-                return BI.extend({}, ob, {type: "bi.flex_vertical_adapt"});
-                // }
-            }
-            if (!BI.isIE() || BI.getIEVersion() > 8) {
-                return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"});
-            }
-        }
-        return ob;
+        // return BI.extend({}, ob, {type: "bi.table_adapt"});
     });
+    // BI.Plugin.configWidget("bi.center_adapt", function (ob) {
+    //     var supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
+    //     var isAdapt = !ob.horizontalAlign || ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch;
+    //     if (!isAdapt || justOneItem) {
+    //         if (supportFlex) {
+    //             // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
+    //             // if (!isIE || (ob.scrollable !== true && ob.scrollx !== true && ob.scrolly !== true)) {
+    //             return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
+    //             // }
+    //         }
+    //         if (!BI.isIE() || BI.getIEVersion() >= 8) {
+    //             return BI.extend({}, ob, {type: "bi.inline_center_adapt"});
+    //         }
+    //     }
+    //     return ob;
+    // });
+    // BI.Plugin.configWidget("bi.vertical_adapt", function (ob) {
+    //     var supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
+    //     var isAdapt = ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch;
+    //     if (!isAdapt || justOneItem) {
+    //         if (supportFlex) {
+    //             // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
+    //             // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
+    //             return BI.extend({}, ob, {type: "bi.flex_vertical_adapt"});
+    //             // }
+    //         }
+    //         if (!BI.isIE() || BI.getIEVersion() > 8) {
+    //             return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"});
+    //         }
+    //     }
+    //     return ob;
+    // });
     BI.Plugin.configWidget("bi.horizontal_adapt", function (ob) {
         var justOneItem = (ob.items && ob.items.length <= 1);
         if (!ob.verticalAlign || ob.verticalAlign === BI.VerticalAlign.TOP) {

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

@@ -8,6 +8,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
         return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
             baseCls: "bi-h-a",
             verticalAlign: BI.VerticalAlign.Top,
+            horizontalAlign: BI.HorizontalAlign.Center,
             columnSize: [],
             scrollx: false,
             hgap: 0,
@@ -24,7 +25,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
         return {
             type: "bi.horizontal",
             verticalAlign: o.verticalAlign,
-            horizontalAlign: BI.HorizontalAlign.Center,
+            horizontalAlign: o.horizontalAlign,
             columnSize: o.columnSize,
             items: o.items,
             scrollx: o.scrollx,