Pull request #2567: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master * commit '1acc0a778e3adda5fb60505d6c7f99c18e4de6a1': bugfix
3 years ago · 37a33c7d1c
22 changed files with 211 additions and 140 deletions
--- a/src/base/single/button/listitem/blankiconicontextitem.js
+++ b/src/base/single/button/listitem/blankiconicontextitem.js
@ -50,6 +50,7 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -63,6 +64,7 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }]
        };
    },
--- a/src/base/single/button/listitem/blankicontexticonitem.js
+++ b/src/base/single/button/listitem/blankicontexticonitem.js
@ -44,6 +44,7 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -57,6 +58,7 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }, {
                type: "bi.icon_label",
                cls: o.iconCls2,
--- a/src/base/single/button/listitem/blankicontextitem.js
+++ b/src/base/single/button/listitem/blankicontextitem.js
@ -42,6 +42,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -56,6 +57,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }]
        };
    },
--- a/src/base/single/button/listitem/icontexticonitem.js
+++ b/src/base/single/button/listitem/icontexticonitem.js
@ -40,6 +40,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -53,6 +54,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }, {
                type: "bi.icon_label",
                cls: o.iconCls2,
--- a/src/base/single/button/listitem/icontextitem.js
+++ b/src/base/single/button/listitem/icontextitem.js
@ -40,6 +40,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -54,6 +55,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }]
        };
    },
--- a/src/base/single/button/listitem/texticonitem.js
+++ b/src/base/single/button/listitem/texticonitem.js
@ -33,6 +33,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
            type: "bi.vertical_adapt",
            columnSize: ["fill", o.iconWrapperWidth || o.height],
            items: [{
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -47,6 +48,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }, {
                type: "bi.icon_label",
                cls: o.iconCls,
--- a/src/base/single/button/node/icontexticonnode.js
+++ b/src/base/single/button/node/icontexticonnode.js
@ -38,6 +38,7 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -51,6 +52,7 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }, {
                type: "bi.icon_label",
                cls: o.iconCls2,
--- a/src/base/single/button/node/icontextnode.js
+++ b/src/base/single/button/node/icontextnode.js
@ -37,6 +37,7 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
                iconWidth: o.iconWidth,
                iconHeight: o.iconHeight
            }, {
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -51,6 +52,7 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }]
        };
    },
--- a/src/base/single/button/node/texticonnode.js
+++ b/src/base/single/button/node/texticonnode.js
@ -29,6 +29,7 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
            type: "bi.vertical_adapt",
            columnSize: ["fill", o.iconWrapperWidth || o.height],
            items: [{
+                el: {
                    type: "bi.label",
                    ref: function (_ref) {
                        self.text = _ref;
@ -43,6 +44,7 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
                    value: o.value,
                    keyword: o.keyword,
                    height: o.height
+                }
            }, {
                type: "bi.icon_label",
                cls: o.iconCls,
--- a/src/case/button/item.multiselect.js
+++ b/src/case/button/item.multiselect.js
@ -17,7 +17,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
            iconWrapperWidth: 26,
            textHgap: 0,
            textLgap: 0,
-            textRgap: 0
+            textRgap: 0,
+            textVgap: 0,
        });
    },

@ -48,9 +49,10 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
                    whiteSpace: "nowrap",
                    textHeight: o.height,
                    height: o.height,
-                    hgap: o.hgap,
-                    rgap: o.rgap,
+                    hgap: o.textHgap,
+                    rgap: o.textRgap,
                    lgap: o.textLgap,
+                    vgap: o.textVgap,
                    text: o.text,
                    keyword: o.keyword,
                    value: o.value,
--- a/src/case/button/item.singleselect.icontext.js
+++ b/src/case/button/item.singleselect.icontext.js
@ -28,6 +28,10 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
            height: o.height,
            iconHeight: o.iconHeight,
            iconWidth: o.iconWidth,
+            textHgap: o.textHgap,
+            textVgap: o.textVgap,
+            textLgap: o.textLgap,
+            textRgap: o.textRgap,
            text: o.text,
            keyword: o.keyword,
            value: o.value,
--- a/src/case/button/item.singleselect.js
+++ b/src/case/button/item.singleselect.js
@ -5,7 +5,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
            attributes: {
                tabIndex: 1
            },
-            hgap: 10,
+            textHgap: 10,
            height: 24,
            textAlign: "left"
        });
@ -20,7 +20,10 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
            whiteSpace: "nowrap",
            textHeight: o.height,
            height: o.height,
-            hgap: o.hgap,
+            hgap: o.hgap || o.textHgap,
+            vgap: o.textVgap,
+            lgap: o.textLgap,
+            rgap: o.textRgap,
            text: o.text,
            keyword: o.keyword,
            value: o.value,
--- a/src/case/button/item.singleselect.radio.js
+++ b/src/case/button/item.singleselect.radio.js
@ -15,8 +15,8 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
            },
            height: 24,
            iconWrapperWidth: 16,
-            hgap: 10,
-            textHgap: 0,
+            textHgap: 10,
+            textVgap: 0,
            textLgap: 0,
            textRgap: 0
        });
@ -46,9 +46,10 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
                    whiteSpace: "nowrap",
                    textHeight: o.height,
                    height: o.height,
-                    hgap: o.hgap,
-                    rgap: o.textRgap,
+                    hgap: o.hgap || o.textHgap,
+                    vgap: o.textVgap,
                    lgap: o.textLgap,
+                    rgap: o.textRgap,
                    text: o.text,
                    keyword: o.keyword,
                    value: o.value,
--- a/src/case/button/node/node.arrow.js
+++ b/src/case/button/node/node.arrow.js
@ -41,7 +41,10 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
                    whiteSpace: "nowrap",
                    textHeight: o.height,
                    height: o.height,
-                    hgap: o.hgap,
+                    hgap: o.hgap || o.textHgap,
+                    vgap: o.textVgap,
+                    lgap: o.textLgap,
+                    rgap: o.textRgap,
                    text: o.text,
                    value: o.value,
                    py: o.py,
--- a/src/case/button/node/node.plus.js
+++ b/src/case/button/node/node.plus.js
@ -46,7 +46,10 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
                    whiteSpace: "nowrap",
                    textHeight: o.height,
                    height: o.height,
-                    hgap: o.hgap,
+                    hgap: o.hgap || o.textHgap,
+                    vgap: o.textVgap,
+                    lgap: o.textLgap,
+                    rgap: o.textRgap,
                    text: o.text,
                    value: o.value,
                    keyword: o.keyword,
--- a/src/case/combo/iconcombo/combo.icon.js
+++ b/src/case/combo/iconcombo/combo.icon.js
@ -25,8 +25,14 @@ BI.IconCombo = BI.inherit(BI.Widget, {
    },

    _init: function () {
-        BI.IconCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
+        BI.IconCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget(o.el, {
            type: "bi.icon_combo_trigger",
            iconCls: o.iconCls,
--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@ -15,8 +15,14 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {

    _init: function () {
        var self = this, o = this.options;
-        o.height -= 2;
        BI.isNumeric(o.width) && (o.width -= 2);
+        BI.isNumeric(o.height) && (o.height -= 2);
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
        BI.IconTextValueCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget({
            type: "bi.select_icon_text_trigger",
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@ -15,6 +15,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

    render: function () {
        var self = this, o = this.options;
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
        return {
            type: "bi.absolute",
            items: [{
--- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
+++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
@ -16,8 +16,14 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {

    _init: function () {
        var self = this, o = this.options;
-        o.height -= 2;
        BI.isNumeric(o.width) && (o.width -= 2);
+        BI.isNumeric(o.height) && (o.height -= 2);
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
        BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget({
            type: "bi.select_text_trigger",
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@ -17,8 +17,14 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {

    _init: function () {
        var self = this, o = this.options;
-        o.height -= 2;
        BI.isNumeric(o.width) && (o.width -= 2);
+        BI.isNumeric(o.height) && (o.height -= 2);
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
        BI.TextValueCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget({
            type: "bi.select_text_trigger",
--- a/src/case/combo/textvaluecombo/combo.textvaluesmall.js
+++ b/src/case/combo/textvaluecombo/combo.textvaluesmall.js
@ -16,8 +16,14 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
    },

    _init: function () {
-        BI.SmallTextValueCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
+        BI.SmallTextValueCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget(o.el, {
            type: "bi.small_select_text_trigger",
            items: o.items,
--- a/src/case/trigger/trigger.text.js
+++ b/src/case/trigger/trigger.text.js
@ -44,10 +44,11 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {

        BI.createWidget({
            element: this,
-            type: "bi.htape",
+            type: "bi.horizontal_fill",
            items: [
                {
-                    el: this.text
+                    el: this.text,
+                    width: "fill"
                }, {
                    el: this.trigerButton,
                    width: o.triggerWidth || o.height