Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts: # dist/_fineui.min.js # dist/bundle.min.js # dist/fineui.min.js
6 years ago · 3121f2bc4a
11 changed files with 40 additions and 20 deletions
--- a/dist/base.js
+++ b/dist/base.js
@ -18645,7 +18645,7 @@ BI.shortcut("bi.editor", BI.Editor);/**
 * @extends BI.Single
 * @abstract
 */
-BI.MultifileEditor = BI.inherit(BI.Single, {
+BI.MultifileEditor = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        var conf = BI.MultifileEditor.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
@ -18669,7 +18669,8 @@ BI.MultifileEditor = BI.inherit(BI.Single, {
            url: o.url,
            multiple: o.multiple,
            accept: o.accept,
-            maxSize: o.maxSize
+            maxSize: o.maxSize,
+            title: o.title
        });
        this.file.on(BI.File.EVENT_CHANGE, function () {
            self.fireEvent(BI.MultifileEditor.EVENT_CHANGE, arguments);
@ -19434,6 +19435,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
                this.element.attr("multiple", "multiple");
            }
            this.element.attr("name", o.name || this.getName());
+            this.element.attr("title", o.title || "");
        },

        mounted: function () {
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -54411,7 +54411,7 @@ BI.shortcut("bi.editor", BI.Editor);/**
 * @extends BI.Single
 * @abstract
 */
-BI.MultifileEditor = BI.inherit(BI.Single, {
+BI.MultifileEditor = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        var conf = BI.MultifileEditor.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
@ -54435,7 +54435,8 @@ BI.MultifileEditor = BI.inherit(BI.Single, {
            url: o.url,
            multiple: o.multiple,
            accept: o.accept,
-            maxSize: o.maxSize
+            maxSize: o.maxSize,
+            title: o.title
        });
        this.file.on(BI.File.EVENT_CHANGE, function () {
            self.fireEvent(BI.MultifileEditor.EVENT_CHANGE, arguments);
@ -55200,6 +55201,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
                this.element.attr("multiple", "multiple");
            }
            this.element.attr("name", o.name || this.getName());
+            this.element.attr("title", o.title || "");
        },

        mounted: function () {
@ -84372,7 +84374,7 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
        var regionSize = o.regionColumnSize[0];
        var freezeColLength = this._getFreezeColLength();
        if (!regionSize || regionSize > o.width - 10 || regionSize < 10) {
-            regionSize = (freezeColLength > o.columnSize.length / 2 ? 2 / 3 : 1 / 3) * o.width;
+            regionSize = (freezeColLength > o.columnSize.length / 2 ? 4 / 5 : 1 / 5) * o.width;
        }
        if (freezeColLength === 0) {
            regionSize = 0;
@ -85553,6 +85555,7 @@ BI.TableStyleCell = BI.inherit(BI.Single, {
        this.text = BI.createWidget({
            type: "bi.label",
            element: this,
+            height: o.height,
            textAlign: "left",
            forceCenter: true,
            hgap: 5,
@ -98237,6 +98240,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        arguments[0] = this._createItems(items);
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -111795,7 +111799,8 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.populate(o.items);
+            this.items = o.items;
+            this.list.populate();
        }
    },

@ -111813,7 +111818,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {

    populate: function (items) {
        // 直接用combo的populate不会作用到AbstractValueChooser上
-        this.items = items;
+        items && (this.items = items);
        this.list.populate.apply(this.list, arguments);
    }
 });
--- a/dist/case.js
+++ b/dist/case.js
@ -11896,7 +11896,7 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
        var regionSize = o.regionColumnSize[0];
        var freezeColLength = this._getFreezeColLength();
        if (!regionSize || regionSize > o.width - 10 || regionSize < 10) {
-            regionSize = (freezeColLength > o.columnSize.length / 2 ? 2 / 3 : 1 / 3) * o.width;
+            regionSize = (freezeColLength > o.columnSize.length / 2 ? 4 / 5 : 1 / 5) * o.width;
        }
        if (freezeColLength === 0) {
            regionSize = 0;
@ -13077,6 +13077,7 @@ BI.TableStyleCell = BI.inherit(BI.Single, {
        this.text = BI.createWidget({
            type: "bi.label",
            element: this,
+            height: o.height,
            textAlign: "left",
            forceCenter: true,
            hgap: 5,
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -54654,7 +54654,7 @@ BI.shortcut("bi.editor", BI.Editor);/**
 * @extends BI.Single
 * @abstract
 */
-BI.MultifileEditor = BI.inherit(BI.Single, {
+BI.MultifileEditor = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        var conf = BI.MultifileEditor.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
@ -54678,7 +54678,8 @@ BI.MultifileEditor = BI.inherit(BI.Single, {
            url: o.url,
            multiple: o.multiple,
            accept: o.accept,
-            maxSize: o.maxSize
+            maxSize: o.maxSize,
+            title: o.title
        });
        this.file.on(BI.File.EVENT_CHANGE, function () {
            self.fireEvent(BI.MultifileEditor.EVENT_CHANGE, arguments);
@ -55443,6 +55444,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
                this.element.attr("multiple", "multiple");
            }
            this.element.attr("name", o.name || this.getName());
+            this.element.attr("title", o.title || "");
        },

        mounted: function () {
@ -84615,7 +84617,7 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
        var regionSize = o.regionColumnSize[0];
        var freezeColLength = this._getFreezeColLength();
        if (!regionSize || regionSize > o.width - 10 || regionSize < 10) {
-            regionSize = (freezeColLength > o.columnSize.length / 2 ? 2 / 3 : 1 / 3) * o.width;
+            regionSize = (freezeColLength > o.columnSize.length / 2 ? 4 / 5 : 1 / 5) * o.width;
        }
        if (freezeColLength === 0) {
            regionSize = 0;
@ -85796,6 +85798,7 @@ BI.TableStyleCell = BI.inherit(BI.Single, {
        this.text = BI.createWidget({
            type: "bi.label",
            element: this,
+            height: o.height,
            textAlign: "left",
            forceCenter: true,
            hgap: 5,
@ -98480,6 +98483,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        arguments[0] = this._createItems(items);
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -112038,7 +112042,8 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.populate(o.items);
+            this.items = o.items;
+            this.list.populate();
        }
    },

@ -112056,7 +112061,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {

    populate: function (items) {
        // 直接用combo的populate不会作用到AbstractValueChooser上
-        this.items = items;
+        items && (this.items = items);
        this.list.populate.apply(this.list, arguments);
    }
 });
--- a/dist/widget.js
+++ b/dist/widget.js
@ -10676,6 +10676,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        arguments[0] = this._createItems(items);
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -24234,7 +24235,8 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.populate(o.items);
+            this.items = o.items;
+            this.list.populate();
        }
    },

@ -24252,7 +24254,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {

    populate: function (items) {
        // 直接用combo的populate不会作用到AbstractValueChooser上
-        this.items = items;
+        items && (this.items = items);
        this.list.populate.apply(this.list, arguments);
    }
 });
--- a/src/base/single/editor/editor.multifile.js
+++ b/src/base/single/editor/editor.multifile.js
@ -6,7 +6,7 @@
 * @extends BI.Single
 * @abstract
 */
-BI.MultifileEditor = BI.inherit(BI.Single, {
+BI.MultifileEditor = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        var conf = BI.MultifileEditor.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
@ -30,7 +30,8 @@ BI.MultifileEditor = BI.inherit(BI.Single, {
            url: o.url,
            multiple: o.multiple,
            accept: o.accept,
-            maxSize: o.maxSize
+            maxSize: o.maxSize,
+            title: o.title
        });
        this.file.on(BI.File.EVENT_CHANGE, function () {
            self.fireEvent(BI.MultifileEditor.EVENT_CHANGE, arguments);
--- a/src/base/single/input/file.js
+++ b/src/base/single/input/file.js
@ -407,6 +407,7 @@
                this.element.attr("multiple", "multiple");
            }
            this.element.attr("name", o.name || this.getName());
+            this.element.attr("title", o.title || "");
        },

        mounted: function () {
--- a/src/case/table/table.adaptive.js
+++ b/src/case/table/table.adaptive.js
@ -107,7 +107,7 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
        var regionSize = o.regionColumnSize[0];
        var freezeColLength = this._getFreezeColLength();
        if (!regionSize || regionSize > o.width - 10 || regionSize < 10) {
-            regionSize = (freezeColLength > o.columnSize.length / 2 ? 2 / 3 : 1 / 3) * o.width;
+            regionSize = (freezeColLength > o.columnSize.length / 2 ? 4 / 5 : 1 / 5) * o.width;
        }
        if (freezeColLength === 0) {
            regionSize = 0;
--- a/src/case/table/table.style.cell.js
+++ b/src/case/table/table.style.cell.js
@ -19,6 +19,7 @@ BI.TableStyleCell = BI.inherit(BI.Single, {
        this.text = BI.createWidget({
            type: "bi.label",
            element: this,
+            height: o.height,
            textAlign: "left",
            forceCenter: true,
            hgap: 5,
--- a/src/component/valuechooser/pane.valuechooser.js
+++ b/src/component/valuechooser/pane.valuechooser.js
@ -31,7 +31,8 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.populate(o.items);
+            this.items = o.items;
+            this.list.populate();
        }
    },

@ -49,7 +50,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {

    populate: function (items) {
        // 直接用combo的populate不会作用到AbstractValueChooser上
-        this.items = items;
+        items && (this.items = items);
        this.list.populate.apply(this.list, arguments);
    }
 });
--- a/src/widget/multiselect/multiselect.loader.js
+++ b/src/widget/multiselect/multiselect.loader.js
@ -156,6 +156,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
+        arguments[0] = this._createItems(items);
        this.button_group.populate.apply(this.button_group, arguments);
    },