Pull request #2571: 无JIRA任务默认值放属性上

Merge in VISUAL/fineui from ~GUY/fineui:master to master * commit '738a81cb7c9568e3128bb76c053f285d954ec042': 默认值放属性上
3 years ago · 45255bc387
11 changed files with 9 additions and 12 deletions
--- a/src/case/button/item.multiselect.js
+++ b/src/case/button/item.multiselect.js
@ -10,7 +10,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
            attributes: {
                tabIndex: 1
            },
-            height: 24,
+            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            logic: {
                dynamic: false
            },
--- a/src/case/button/item.singleselect.icontext.js
+++ b/src/case/button/item.singleselect.icontext.js
@ -12,7 +12,7 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
                tabIndex: 1
            },
            iconCls: "",
-            height: 24
+            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
        });
    },

--- a/src/case/button/item.singleselect.js
+++ b/src/case/button/item.singleselect.js
@ -6,7 +6,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
                tabIndex: 1
            },
            textHgap: 10,
-            height: 24,
+            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            textAlign: "left"
        });
    },
--- a/src/case/button/item.singleselect.radio.js
+++ b/src/case/button/item.singleselect.radio.js
@ -13,7 +13,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            height: 24,
+            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            iconWrapperWidth: 16,
            textHgap: 10,
            textVgap: 0,
--- a/src/case/calendar/calendar.date.item.js
+++ b/src/case/calendar/calendar.date.item.js
@ -2,6 +2,11 @@
 * 专门为calendar的视觉加的button，作为私有button,不能配置任何属性，也不要用这个玩意
 */
 BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
+    props: function() {
+        return {
+            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 8,
+        } 
+    },

    render: function () {
        var self = this, o = this.options;
--- a/src/case/calendar/calendar.js
+++ b/src/case/calendar/calendar.js
@ -162,7 +162,6 @@ BI.Calendar = BI.inherit(BI.Widget, {
                    whiteSpace: "normal",
                    once: false,
                    forceSelected: true,
-                    height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 8,
                    value: o.year + "-" + month + "-" + td.text,
                    disabled: td.lastMonth || td.nextMonth || td.disabled,
                    lgap: 2,
--- a/src/case/combo/iconcombo/popup.iconcombo.js
+++ b/src/case/combo/iconcombo/popup.iconcombo.js
@ -19,7 +19,6 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
            type: "bi.button_group",
            items: BI.createItems(o.items, {
                type: "bi.single_select_icon_text_item",
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            }),
            chooseType: o.chooseType,
            layouts: [{
@ -47,7 +46,6 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
        BI.IconComboPopup.superclass.populate.apply(this, arguments);
        items = BI.createItems(items, {
            type: "bi.single_select_icon_text_item",
-            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
        });
        this.popup.populate(items);
    },
--- a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
@ -20,7 +20,6 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
            type: "bi.button_group",
            items: BI.createItems(o.items, {
                type: "bi.single_select_icon_text_item",
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                iconHeight: o.iconHeight,
                iconWidth: o.iconWidth,
                iconWrapperWidth: o.iconWrapperWidth
@ -55,7 +54,6 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
        var o = this.options;
        items = BI.createItems(items, {
            type: "bi.single_select_icon_text_item",
-            height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            iconWrapperWidth: o.iconWrapperWidth,
            iconHeight: o.iconHeight,
            iconWidth: o.iconWidth,
--- a/src/case/combo/searchtextvaluecombo/popup.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/popup.searchtextvalue.js
@ -47,7 +47,6 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
            return BI.extend({
                type: "bi.single_select_item",
                textAlign: o.textAlign,
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                title: item.title || item.text
            }, item);
        });
--- a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js
+++ b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js
@ -41,7 +41,6 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
                type: "bi.single_select_item",
                cls: "bi-list-item",
                textAlign: o.textAlign,
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                title: item.title || item.text
            }, item);
        });
--- a/src/case/combo/textvaluecombo/popup.textvalue.js
+++ b/src/case/combo/textvaluecombo/popup.textvalue.js
@ -41,7 +41,6 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
            return BI.extend({
                type: "bi.single_select_item",
                textAlign: o.textAlign,
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                title: item.title || item.text
            }, item);
        });