Pull request #2471: 无JIRA任务 icon_text_item族

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '19e22aba40f862522f5c96afd08d5d27761031b9':
  icon_text_item族

src/base/single/button/listitem/blankiconicontextitem.js

@@ -27,45 +27,44 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
     },
 
     render: function () {
-        var o = this.options, c = this._const;
-        var blank = BI.createWidget({
-            type: "bi.layout",
-            width: o.blankWidth,
-            height: o.height
-        });
-        this.text = BI.createWidget({
-            type: "bi.label",
-            cls: "list-item-text",
-            textAlign: "left",
-            hgap: o.textHgap,
-            vgap: o.textVgap,
-            lgap: o.textLgap,
-            rgap: o.textRgap,
-            text: o.text,
-            value: o.value,
-            keyword: o.keyword,
-            height: o.height
-        });
-        this.icon1 = BI.createWidget({
-            type: "bi.icon_button",
-            cls: o.iconCls1,
-            forceNotSelected: true,
-            width: o.height,
-            height: o.height
-        });
-        this.icon2 = BI.createWidget({
-            type: "bi.icon_button",
-            cls: o.iconCls2,
-            forceNotSelected: true,
-            width: o.height,
-            height: o.height
-        });
+        var self = this, o = this.options;
 
-        BI.createWidget(BI.extend({
-            element: this
-        }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
-            items: BI.LogicFactory.createLogicItemsByDirection("left", blank, this.icon1, this.icon2, this.text)
-        }))));
+        return {
+            type: "bi.vertical_adapt",
+            columnSize: [o.blankWidth, o.leftIconWrapperWidth || o.height, o.rightIconWrapperWidth || o.height, "fill"],
+            items: [{
+                type: "bi.layout",
+                width: o.blankWidth
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls1,
+                width: o.leftIconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls2,
+                width: o.rightIconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }, {
+                type: "bi.label",
+                ref: function (_ref) {
+                    self.text = _ref;
+                },
+                textAlign: "left",
+                hgap: o.textHgap,
+                vgap: o.textVgap,
+                lgap: o.textLgap,
+                rgap: o.textRgap,
+                text: o.text,
+                value: o.value,
+                keyword: o.keyword,
+                height: o.height
+            }]
+        };
     },
 
     doClick: function () {

src/base/single/button/listitem/blankicontexticonitem.js

@@ -28,57 +28,44 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
     },
 
     render: function () {
-        var o = this.options, c = this._const;
-        this.text = BI.createWidget({
-            type: "bi.label",
-            textAlign: "left",
-            hgap: o.textHgap,
-            vgap: o.textVgap,
-            lgap: o.textLgap,
-            rgap: o.textRgap,
-            text: o.text,
-            value: o.value,
-            keyword: o.keyword,
-            height: o.height
-        });
+        var self = this, o = this.options;
 
-        var icon1 = BI.createWidget({
-            type: "bi.icon_label",
-            cls: o.iconCls1,
-            width: o.height,
-            height: o.height,
-            iconWidth: o.iconWidth,
-            iconHeight: o.iconHeight
-        });
-        BI.createWidget({
-            type: "bi.absolute",
-            element: this,
+        return {
+            type: "bi.vertical_adapt",
+            columnSize: [o.blankWidth, o.leftIconWrapperWidth || o.height, "fill", o.rightIconWrapperWidth || o.height],
             items: [{
-                el: {
-                    type: "bi.icon_label",
-                    cls: o.iconCls2,
-                    width: o.height,
-                    height: o.height,
-                    iconWidth: o.iconWidth,
-                    iconHeight: o.iconHeight
-                },
-                top: 0,
-                bottom: 0,
-                right: 0
-            }]
-        });
-
-        BI.createWidget(BI.extend({
-            element: this
-        }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
-            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                 type: "bi.layout",
                 width: o.blankWidth
-            }, icon1, this.text, {
-                type: "bi.layout",
-                width: o.height
-            })
-        }))));
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls1,
+                width: o.leftIconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }, {
+                type: "bi.label",
+                ref: function (_ref) {
+                    self.text = _ref;
+                },
+                textAlign: "left",
+                hgap: o.textHgap,
+                vgap: o.textVgap,
+                lgap: o.textLgap,
+                rgap: o.textRgap,
+                text: o.text,
+                value: o.value,
+                keyword: o.keyword,
+                height: o.height
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls2,
+                width: o.rightIconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }]
+        };
     },
 
     doClick: function () {

src/base/single/button/listitem/blankicontextitem.js

@@ -26,38 +26,38 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
     },
 
     render: function () {
-        var o = this.options, c = this._const;
-        var blank = BI.createWidget({
-            type: "bi.layout",
-            width: o.blankWidth
-        });
-        this.text = BI.createWidget({
-            type: "bi.label",
-            cls: "list-item-text",
-            textAlign: "left",
-            hgap: o.textHgap,
-            vgap: o.textVgap,
-            lgap: o.textLgap,
-            rgap: o.textRgap,
-            text: o.text,
-            value: o.value,
-            keyword: o.keyword,
-            height: o.height
-        });
-        this.icon = BI.createWidget({
-            type: "bi.icon_label",
-            cls: o.iconCls,
-            width: o.height,
-            height: o.height,
-            iconWidth: o.iconWidth,
-            iconHeight: o.iconHeight
-        });
+        var self = this, o = this.options;
 
-        BI.createWidget(BI.extend({
-            element: this
-        }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
-            items: BI.LogicFactory.createLogicItemsByDirection("left", blank, this.icon, this.text)
-        }))));
+        return {
+            type: "bi.vertical_adapt",
+            columnSize: [o.blankWidth, "fill", o.iconWrapperWidth || o.height],
+            items: [{
+                type: "bi.layout",
+                width: o.blankWidth
+            }, {
+                type: "bi.label",
+                ref: function (_ref) {
+                    self.text = _ref;
+                },
+                cls: "list-item-text",
+                textAlign: "left",
+                hgap: o.textHgap,
+                vgap: o.textVgap,
+                lgap: o.textLgap,
+                rgap: o.textRgap,
+                text: o.text,
+                value: o.value,
+                keyword: o.keyword,
+                height: o.height
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls,
+                width: o.iconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }]
+        };
     },
 
     doClick: function () {

src/base/single/button/listitem/icontexticonitem.js

@@ -27,55 +27,41 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
     },
 
     render: function () {
-        var o = this.options, c = this._const;
-        this.text = BI.createWidget({
-            type: "bi.label",
-            textAlign: "left",
-            hgap: o.textHgap,
-            vgap: o.textVgap,
-            lgap: o.textLgap,
-            rgap: o.textRgap,
-            text: o.text,
-            value: o.value,
-            keyword: o.keyword,
-            height: o.height
-        });
+        var self = this, o = this.options;
 
-        var icon1 = BI.createWidget({
-            type: "bi.icon_label",
-            cls: o.iconCls1,
-            width: o.leftIconWrapperWidth || o.height,
-            height: o.height,
-            iconWidth: o.iconWidth,
-            iconHeight: o.iconHeight
-        });
-        var blank = BI.createWidget({
-            type: "bi.layout",
-            width: o.height
-        });
-        BI.createWidget({
-            type: "bi.absolute",
-            element: this,
+        return {
+            type: "bi.vertical_adapt",
+            columnSize: [o.leftIconWrapperWidth || o.height, "fill", o.rightIconWrapperWidth || o.height],
             items: [{
-                el: {
-                    type: "bi.icon_label",
-                    cls: o.iconCls2,
-                    width: o.rightIconWrapperWidth || o.height,
-                    height: o.height,
-                    iconWidth: o.iconWidth,
-                    iconHeight: o.iconHeight
+                type: "bi.icon_label",
+                cls: o.iconCls1,
+                width: o.leftIconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }, {
+                type: "bi.label",
+                ref: function (_ref) {
+                    self.text = _ref;
                 },
-                top: 0,
-                bottom: 0,
-                right: 0
+                textAlign: "left",
+                hgap: o.textHgap,
+                vgap: o.textVgap,
+                lgap: o.textLgap,
+                rgap: o.textRgap,
+                text: o.text,
+                value: o.value,
+                keyword: o.keyword,
+                height: o.height
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls2,
+                width: o.rightIconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
             }]
-        });
-
-        BI.createWidget(BI.extend({
-            element: this
-        }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
-            items: BI.LogicFactory.createLogicItemsByDirection("left", icon1, this.text, blank)
-        }))));
+        };
     },
 
     doClick: function () {

src/base/single/button/listitem/icontextitem.js

@@ -27,34 +27,35 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
     },
 
     render: function () {
-        var o = this.options, c = this._const;
-        this.text = BI.createWidget({
-            type: "bi.label",
-            cls: "list-item-text",
-            textAlign: "left",
-            hgap: o.textHgap,
-            vgap: o.textVgap,
-            lgap: o.textLgap,
-            rgap: o.textRgap,
-            text: o.text,
-            value: o.value,
-            keyword: o.keyword,
-            height: o.height
-        });
-        this.icon = BI.createWidget({
-            type: "bi.icon_label",
-            cls: o.iconCls,
-            width: o.iconWrapperWidth || o.height,
-            height: o.height,
-            iconWidth: o.iconWidth,
-            iconHeight: o.iconHeight
-        });
+        var self = this, o = this.options;
 
-        BI.createWidget(BI.extend({
-            element: this
-        }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, {
-            items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text)
-        }))));
+        return {
+            type: "bi.vertical_adapt",
+            columnSize: [o.iconWrapperWidth || o.height, "fill"],
+            items: [{
+                type: "bi.icon_label",
+                cls: o.iconCls,
+                width: o.iconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }, {
+                type: "bi.label",
+                ref: function (_ref) {
+                    self.text = _ref;
+                },
+                cls: "list-item-text",
+                textAlign: "left",
+                hgap: o.textHgap,
+                vgap: o.textVgap,
+                lgap: o.textLgap,
+                rgap: o.textRgap,
+                text: o.text,
+                value: o.value,
+                keyword: o.keyword,
+                height: o.height
+            }]
+        };
     },
 
     doClick: function () {

src/base/single/button/listitem/texticonitem.js

@@ -15,6 +15,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
             logic: {
                 dynamic: false
             },
+            iconWrapperWidth: null,
             iconHeight: null,
             iconWidth: null,
             iconCls: "",
@@ -26,34 +27,35 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
     },
 
     render: function () {
-        var o = this.options, c = this._const;
-        this.text = BI.createWidget({
-            type: "bi.label",
-            cls: "list-item-text",
-            textAlign: "left",
-            hgap: o.textHgap,
-            vgap: o.textVgap,
-            lgap: o.textLgap,
-            rgap: o.textRgap,
-            text: o.text,
-            value: o.value,
-            keyword: o.keyword,
-            height: o.height
-        });
-        this.icon = BI.createWidget({
-            type: "bi.icon_label",
-            cls: o.iconCls,
-            width: o.height,
-            height: o.height,
-            iconWidth: o.iconWidth,
-            iconHeight: o.iconHeight
-        });
+        var self = this, o = this.options;
 
-        BI.createWidget(BI.extend({
-            element: this
-        }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
-            items: BI.LogicFactory.createLogicItemsByDirection("left", this.text, this.icon)
-        }))));
+        return {
+            type: "bi.vertical_adapt",
+            columnSize: ["fill", o.iconWrapperWidth || o.height],
+            items: [{
+                type: "bi.label",
+                ref: function (_ref) {
+                    self.text = _ref;
+                },
+                cls: "list-item-text",
+                textAlign: "left",
+                hgap: o.textHgap,
+                vgap: o.textVgap,
+                lgap: o.textLgap,
+                rgap: o.textRgap,
+                text: o.text,
+                value: o.value,
+                keyword: o.keyword,
+                height: o.height
+            }, {
+                type: "bi.icon_label",
+                cls: o.iconCls,
+                width: o.iconWrapperWidth || o.height,
+                height: o.height,
+                iconWidth: o.iconWidth,
+                iconHeight: o.iconHeight
+            }]
+        };
     },
 
     doClick: function () {