Merge pull request #726 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'd1f6035563bdeabc954205a534a71c85b7b1367d': update update update 更新 update update update update 无JIRA任务 populate的时候更新一下items
6 years ago · 02aadd0ef7
25 changed files with 190 additions and 131 deletions
--- a/dist/base.css
+++ b/dist/base.css
@ -654,6 +654,9 @@
  border-radius: 2px;
 }
 .bi-pane {
+  min-height: 25px;
+}
+.bi-pane.loading-status {
  min-height: 55px;
 }
 .bi-pane .loading-container {
--- a/dist/base.js
+++ b/dist/base.js
@ -305,6 +305,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -314,6 +315,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -2608,6 +2608,9 @@ textarea {
  border-radius: 2px;
 }
 .bi-pane {
+  min-height: 25px;
+}
+.bi-pane.loading-status {
  min-height: 55px;
 }
 .bi-pane .loading-container {
--- a/dist/bundle.ie.js
+++ b/dist/bundle.ie.js
@ -35199,6 +35199,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -35208,6 +35209,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
@ -53152,6 +53154,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

@ -62598,7 +62601,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
@ -62955,7 +62958,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");
--- a/dist/bundle.ie.min.js
+++ b/dist/bundle.ie.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -35738,6 +35738,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -35747,6 +35748,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
@ -53691,6 +53693,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

@ -63137,7 +63140,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
@ -63494,7 +63497,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");
--- 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
@ -4820,6 +4820,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

--- a/dist/demo.js
+++ b/dist/demo.js
@ -6041,7 +6041,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
        };
    }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);/**
+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);/**
 * Created by User on 2017/3/22.
 */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -2608,6 +2608,9 @@ textarea {
  border-radius: 2px;
 }
 .bi-pane {
+  min-height: 25px;
+}
+.bi-pane.loading-status {
  min-height: 55px;
 }
 .bi-pane .loading-container {
--- a/dist/fineui.ie.js
+++ b/dist/fineui.ie.js
@ -35441,6 +35441,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -35450,6 +35451,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
@ -53394,6 +53396,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

@ -62840,7 +62843,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
@ -63197,7 +63200,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -35980,6 +35980,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -35989,6 +35990,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
@ -53933,6 +53935,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

@ -63379,7 +63382,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
@ -63736,7 +63739,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");
--- 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
@ -24548,6 +24548,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -24557,6 +24558,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
@ -37014,6 +37016,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

@ -46261,7 +46264,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
@ -46618,7 +46621,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
@ -4436,7 +4436,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
@ -4793,7 +4793,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");
--- a/src/base/pane.js
+++ b/src/base/pane.js
@ -104,6 +104,7 @@ BI.Pane = BI.inherit(BI.Widget, {
                }]
            });
        }
+        this.element.addClass("loading-status");
    },

    loaded: function () {
@ -113,6 +114,7 @@ BI.Pane = BI.inherit(BI.Widget, {
        this._loading && (this._loading = null);
        o.onLoaded();
        self.fireEvent(BI.Pane.EVENT_LOADED);
+        this.element.removeClass("loading-status");
    },

    check: function () {
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@ -138,6 +138,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        this.options.items = items;
        this.combo.populate(items);
    },

--- a/src/css/base/pane.css
+++ b/src/css/base/pane.css
@ -1,4 +1,7 @@
 .bi-pane {
+  min-height: 25px;
+}
+.bi-pane.loading-status {
  min-height: 55px;
 }
 .bi-pane .loading-container {
--- a/src/less/base/pane.less
+++ b/src/less/base/pane.less
@ -2,7 +2,10 @@
@import "../image";
@import "../lib/icon";
 .bi-pane {
+    min-height: 25px;
+    &.loading-status{
        min-height: 55px;
+    }
    & .loading-container {
        .background-color(@color-bi-background-normal, 0);
    }
--- a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
@ -148,7 +148,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
            default:
                break;
        }
-        if(v.length === 1 && BI.parseInt(v) > limit) {
+        if(value.length === 1 && BI.parseInt(value) > limit) {
            value = "0" + value;
        }
        if (value.length === 2) {
--- a/src/widget/editor/editor.search.js
+++ b/src/widget/editor/editor.search.js
@ -30,7 +30,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
        this.clear = BI.createWidget({
            type: "bi.icon_button",
            stopEvent: true,
-            cls: "circle-close-font"
+            cls: "close-font"
        });
        this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
            self.setValue("");