无JIRA icon_text_item 增加一个iconCls props 去掉默认值.

3 years ago · b523566884
7 changed files with 19 additions and 16 deletions
--- a/demo/js/core/abstract/combination/demo.combo.js
+++ b/demo/js/core/abstract/combination/demo.combo.js
@ -26,7 +26,8 @@ Demo.Func = BI.inherit(BI.Widget, {
            text: "2010年",
            value: 2010,
            height: 25,
-            iconCls: "close-ha-font"
+            iconCls1: "close-ha-font",
+            iconCls2: "close-ha-font"
        },
        children: [{
            type: "bi.single_select_item",
@ -38,7 +39,9 @@ Demo.Func = BI.inherit(BI.Widget, {
            height: 25,
            text: "二月",
            value: 12,
-            children: [{type: "bi.single_select_item", text: "一号", value: 101, height: 25}]
+            iconCls1: "close-ha-font",
+            iconCls2: "close-ha-font",
+            children: [{ type: "bi.single_select_item", text: "一号", value: 101, height: 25 }]
        }]
    }, {
        text: "2011年", value: 2011
@ -417,7 +420,7 @@ Demo.Func = BI.inherit(BI.Widget, {
                        }]
                    }, {
                        type: "bi.absolute",
-                        el: {left: 4, top: 2, right: 4, bottom: 2}
+                        el: { left: 4, top: 2, right: 4, bottom: 2 }
                    }]
                }
            },
--- a/demo/js/core/abstract/combination/demo.combo_group.js
+++ b/demo/js/core/abstract/combination/demo.combo_group.js
@ -22,6 +22,8 @@ Demo.Func = BI.inherit(BI.Widget, {
            height: 25,
            text: "二月",
            value: 12,
+            iconCls1: "close-ha-font",
+            iconCls2: "close-ha-font",
            children: [{type: "bi.single_select_item", text: "一号", value: 101, height: 25}]
        }]
    }, {
--- a/src/base/single/button/listitem/blankiconicontextitem.js
+++ b/src/base/single/button/listitem/blankiconicontextitem.js
@ -14,8 +14,8 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            iconCls1: "close-ha-font",
-            iconCls2: "close-ha-font",
+            iconCls1: "",
+            iconCls2: "",
            blankWidth: 0,
            iconHeight: null,
            iconWidth: null,
--- a/src/base/single/button/listitem/blankicontexticonitem.js
+++ b/src/base/single/button/listitem/blankicontexticonitem.js
@ -15,8 +15,8 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            iconCls1: "close-ha-font",
-            iconCls2: "close-ha-font",
+            iconCls1: "",
+            iconCls2: "",
            blankWidth: 0,
            iconHeight: null,
            iconWidth: null,
--- a/src/base/single/button/listitem/blankicontextitem.js
+++ b/src/base/single/button/listitem/blankicontextitem.js
@ -14,7 +14,6 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            cls: "close-ha-font",
            blankWidth: 0,
            iconHeight: null,
            iconWidth: null,
--- a/src/base/single/button/listitem/icontexticonitem.js
+++ b/src/base/single/button/listitem/icontexticonitem.js
@ -15,8 +15,8 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            iconCls1: "close-ha-font",
-            iconCls2: "close-ha-font",
+            iconCls1: "",
+            iconCls2: "",
            iconHeight: null,
            iconWidth: null,
            textHgap: 0,
--- a/src/base/single/button/listitem/texticonitem.js
+++ b/src/base/single/button/listitem/texticonitem.js
@ -15,7 +15,6 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            cls: "close-ha-font",
            iconHeight: null,
            iconWidth: null,
            iconCls: "",