Merge pull request #804 in VISUAL/fineui from ~YOUNG/fineui:master to master

* commit '6749f2958ecd77c6b9d2ae0aba46b79d3369e777': update update update 抽出beforeInit相关逻辑，在LoadingPane中重写loading情况下的render逻辑 update 去掉pane中无效方法无JIRA任务获取数据后渲染页面loading效果
6 years ago · 5e77986a58
20 changed files with 347 additions and 172 deletions
--- a/demo/js/config/demo.pane.js
+++ b/demo/js/config/demo.pane.js
@ -0,0 +1,29 @@
+/**
+ * author: young
+ * createdDate: 2018/11/30
+ * description:
+ */
+!(function () {
+    var Pane = BI.inherit(BI.LoadingPane, {
+        props: {
+
+        },
+
+        render: function () {
+            return {
+                type: "bi.center_adapt",
+                items: [{
+                    type: "bi.label",
+                    text: "this is pane center"
+                }]
+            };
+        },
+
+        beforeInit: function (callback) {
+            setTimeout(function () {
+                callback();
+            }, 3000);
+        }
+    });
+    BI.shortcut("demo.pane", Pane);
+})();
--- a/dist/base.js
+++ b/dist/base.js
@ -218,20 +218,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
--- a/dist/bundle.ie.js
+++ b/dist/bundle.ie.js
@ -11771,6 +11771,10 @@ if (!_global.BI) {
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));
@ -35304,20 +35308,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
@ -57185,6 +57175,36 @@ BI.SortList = BI.inherit(BI.Widget, {
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.sort_list", BI.SortList);
 /**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});/**
 * 有总页数和总行数的分页控件
 * Created by Young's on 2016/10/13.
 */
--- a/dist/bundle.ie.min.js
+++ b/dist/bundle.ie.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -11771,6 +11771,10 @@ if (!_global.BI) {
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));
@ -35708,20 +35712,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
@ -57589,6 +57579,36 @@ BI.SortList = BI.inherit(BI.Widget, {
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.sort_list", BI.SortList);
 /**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});/**
 * 有总页数和总行数的分页控件
 * Created by Young's on 2016/10/13.
 */
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -7973,6 +7973,36 @@ BI.SortList = BI.inherit(BI.Widget, {
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.sort_list", BI.SortList);
 /**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});/**
 * 有总页数和总行数的分页控件
 * Created by Young's on 2016/10/13.
 */
--- a/dist/core.js
+++ b/dist/core.js
@ -11771,6 +11771,10 @@ if (!_global.BI) {
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));
--- a/dist/demo.js
+++ b/dist/demo.js
@ -3498,7 +3498,35 @@ Demo.COMPONENT_CONFIG = [{
    pId: 1,
    text: "Pane(继承)",
    value: "demo.pane"
-}];// 定义Model路由
+}];/**
+ * author: young
+ * createdDate: 2018/11/30
+ * description:
+ */
+!(function () {
+    var Pane = BI.inherit(BI.LoadingPane, {
+        props: {
+
+        },
+
+        render: function () {
+            return {
+                type: "bi.center_adapt",
+                items: [{
+                    type: "bi.label",
+                    text: "this is pane center"
+                }]
+            };
+        },
+
+        beforeInit: function (callback) {
+            setTimeout(function () {
+                callback();
+            }, 3000);
+        }
+    });
+    BI.shortcut("demo.pane", Pane);
+})();// 定义Model路由
 var modelRouter = new (BI.inherit(BI.WRouter, {
    routes: {
        "": "index"
@ -6130,30 +6158,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
        };
    }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-absolute"
-    },
-    render: function () {
-        return {
-            type: "bi.inline_vertical_adapt",
-            items: [{
-                type: "bi.label",
-                text: "绝对布局",
-                cls: "layout-bg1",
-                width: 300,
-                height: 200
-            }, {
-                type: "bi.label",
-                text: "绝对布局",
-                cls: "layout-bg1",
-                width: 300,
-                height: 100
-            }]
-        };
-    }
-});
-BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
+BI.shortcut("demo.htape", Demo.HtapeLayout);/**
 * Created by User on 2017/3/22.
 */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {
--- a/dist/fineui.ie.js
+++ b/dist/fineui.ie.js
@ -12016,6 +12016,10 @@ if (!_global.BI) {
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));
@ -35549,20 +35553,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
@ -57430,6 +57420,36 @@ BI.SortList = BI.inherit(BI.Widget, {
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.sort_list", BI.SortList);
 /**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});/**
 * 有总页数和总行数的分页控件
 * Created by Young's on 2016/10/13.
 */
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -12016,6 +12016,10 @@ if (!_global.BI) {
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));
@ -35953,20 +35957,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
@ -57834,6 +57824,36 @@ BI.SortList = BI.inherit(BI.Widget, {
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.sort_list", BI.SortList);
 /**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});/**
 * 有总页数和总行数的分页控件
 * Created by Young's on 2016/10/13.
 */
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -11771,6 +11771,10 @@ if (!_global.BI) {
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));
@ -24460,20 +24464,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
@ -40847,6 +40837,36 @@ BI.SortList = BI.inherit(BI.Widget, {
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.sort_list", BI.SortList);
 /**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});/**
 * 有总页数和总行数的分页控件
 * Created by Young's on 2016/10/13.
 */
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/src/base/pane.js
+++ b/src/base/pane.js
@ -17,20 +17,6 @@ BI.Pane = BI.inherit(BI.Widget, {
        });
    },

-    _init: function () {
-        BI.Pane.superclass._init.apply(this, arguments);
-        if (this.__async) {
-            this.loading();
-        }
-    },
-
-    _render: function () {
-        BI.Pane.superclass._render.apply(this, arguments);
-        if (this.__async) {
-            this.loaded();
-        }
-    },
-
    _assertTip: function () {
        var o = this.options;
        if (!this._tipText) {
--- a/src/case/loading/loading_pane.js
+++ b/src/case/loading/loading_pane.js
@ -0,0 +1,31 @@
+/**
+ * author: young
+ * createdDate: 2018/12/18
+ * description:
+ */
+BI.LoadingPane = BI.inherit(BI.Pane, {
+    _mount: function () {
+        var isMounted = BI.Pane.superclass._mount.apply(this, arguments);
+        if (isMounted) {
+            if (this.beforeInit) {
+                this.__asking = true;
+                this.loading();
+                this.beforeInit(BI.bind(this.__loaded, this));
+            }
+        }
+    },
+
+    _initRender: function () {
+        if (this.beforeInit) {
+            this.__async = true;
+        } else {
+            this._render();
+        }
+    },
+
+    __loaded: function () {
+        this.__asking = false;
+        this.loaded();
+        this._render();
+    }
+});
--- a/src/core/widget.js
+++ b/src/core/widget.js
@ -54,6 +54,10 @@
            this._initElementHeight();
            this._initVisual();
            this._initState();
+            this._initRender();
+        },
+
+        _initRender: function () {
            if (this.beforeInit) {
                this.__asking = true;
                this.beforeInit(BI.bind(this._render, this));