Merge pull request #256 in FUI/fineui from ~WINDY/fui:master to master

* commit 'b8b7dc52054d8ef11657c200bd5cf11c01a2ae51': update Panel的样式
6 years ago · 1d798c31ec
19 changed files with 122 additions and 38 deletions
--- a/demo/js/case/combo/demo.icon_text_value_combo.js
+++ b/demo/js/case/combo/demo.icon_text_value_combo.js
@ -14,9 +14,11 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
                text: "默认值",
                value: 1,
                width: 300,
+                iconHeight: 16,
+                iconWidth: 16,
                items: [{
                    text: "MVC-1",
-                    iconCls: "close-font",
+                    iconCls: "check-box-icon",
                    value: 1
                }, {
                    text: "MVC-2",
--- a/dist/base.css
+++ b/dist/base.css
@ -748,6 +748,9 @@ li.CodeMirror-hint-active {
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-panel .panel-title {
+  background-color: #F2F4F7;
+}
 .bi-panel .panel-title .panel-title-text {
  cursor: text;
  font-size: 14px;
--- a/dist/base.js
+++ b/dist/base.js
@ -16582,7 +16582,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
            var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
            return BI.extend(conf, {
                baseCls: (conf.baseCls || "") + " bi-button",
-                minWidth: (props.block === true || props.clear === true) ? 0 : 90,
+                minWidth: (props.block === true || props.clear === true) ? 0 : 80,
                shadow: props.clear !== true,
                isShadowShowingOnSelected: true,
                readonly: true,
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -2795,6 +2795,9 @@ li.CodeMirror-hint-active {
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-panel .panel-title {
+  background-color: #F2F4F7;
+}
 .bi-panel .panel-title .panel-title-text {
  cursor: text;
  font-size: 14px;
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -42281,7 +42281,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
            var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
            return BI.extend(conf, {
                baseCls: (conf.baseCls || "") + " bi-button",
-                minWidth: (props.block === true || props.clear === true) ? 0 : 90,
+                minWidth: (props.block === true || props.clear === true) ? 0 : 80,
                shadow: props.clear !== true,
                isShadowShowingOnSelected: true,
                readonly: true,
@ -67772,6 +67772,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
        return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
            baseClass: "bi-icon-text-value-combo",
            height: 30,
+            iconHeight: null,
+            iconWidth: null,
            value: ""
        });
    },
@ -67784,12 +67786,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
            items: o.items,
            height: o.height,
            text: o.text,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup = BI.createWidget({
            type: "bi.icon_text_value_combo_popup",
            items: o.items,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
            self.setValue(self.popup.getValue());
@ -67847,7 +67853,9 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
            type: "bi.button_group",
            items: BI.createItems(o.items, {
                type: "bi.single_select_icon_text_item",
-                height: 30
+                height: 30,
+                iconHeight: o.iconHeight,
+                iconWidth: o.iconWidth
            }),
            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
            layouts: [{
@ -70671,7 +70679,7 @@ BI.Panel = BI.inherit(BI.Widget, {
        return {
            el: {
                type: "bi.left_right_vertical_adapt",
-                cls: "panel-title bi-border-bottom bi-background",
+                cls: "panel-title bi-border-bottom",
                height: 29,
                items: {
                    left: [this.text],
@ -70680,7 +70688,7 @@ BI.Panel = BI.inherit(BI.Widget, {
                lhgap: 10,
                rhgap: 10
            },
-            height: 30
+            height: 29
        };
    },

@ -76317,7 +76325,9 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
            baseCls: (conf.baseCls || "") + " bi-text-trigger",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -76349,6 +76359,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                    ref: function (_ref) {
                        self.icon = _ref;
                    },
+                    iconHeight: o.iconHeight,
+                    iconWidth: o.iconWidth,
                    disableSelected: true
                },
                width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height)
@ -76396,7 +76408,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
    _defaultConfig: function () {
        return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-select-text-trigger bi-border",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -76410,7 +76424,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
            element: this,
            text: obj.text,
            iconCls: obj.iconCls,
-            height: o.height
+            height: o.height,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
    },

--- a/dist/case.js
+++ b/dist/case.js
@ -5493,6 +5493,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
        return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
            baseClass: "bi-icon-text-value-combo",
            height: 30,
+            iconHeight: null,
+            iconWidth: null,
            value: ""
        });
    },
@ -5505,12 +5507,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
            items: o.items,
            height: o.height,
            text: o.text,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup = BI.createWidget({
            type: "bi.icon_text_value_combo_popup",
            items: o.items,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
            self.setValue(self.popup.getValue());
@ -5568,7 +5574,9 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
            type: "bi.button_group",
            items: BI.createItems(o.items, {
                type: "bi.single_select_icon_text_item",
-                height: 30
+                height: 30,
+                iconHeight: o.iconHeight,
+                iconWidth: o.iconWidth
            }),
            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
            layouts: [{
@ -8392,7 +8400,7 @@ BI.Panel = BI.inherit(BI.Widget, {
        return {
            el: {
                type: "bi.left_right_vertical_adapt",
-                cls: "panel-title bi-border-bottom bi-background",
+                cls: "panel-title bi-border-bottom",
                height: 29,
                items: {
                    left: [this.text],
@ -8401,7 +8409,7 @@ BI.Panel = BI.inherit(BI.Widget, {
                lhgap: 10,
                rhgap: 10
            },
-            height: 30
+            height: 29
        };
    },

@ -14038,7 +14046,9 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
            baseCls: (conf.baseCls || "") + " bi-text-trigger",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -14070,6 +14080,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                    ref: function (_ref) {
                        self.icon = _ref;
                    },
+                    iconHeight: o.iconHeight,
+                    iconWidth: o.iconWidth,
                    disableSelected: true
                },
                width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height)
@ -14117,7 +14129,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
    _defaultConfig: function () {
        return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-select-text-trigger bi-border",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -14131,7 +14145,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
            element: this,
            text: obj.text,
            iconCls: obj.iconCls,
-            height: o.height
+            height: o.height,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
    },

--- a/dist/demo.js
+++ b/dist/demo.js
@ -1936,9 +1936,11 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
                text: "默认值",
                value: 1,
                width: 300,
+                iconHeight: 16,
+                iconWidth: 16,
                items: [{
                    text: "MVC-1",
-                    iconCls: "close-font",
+                    iconCls: "check-box-icon",
                    value: 1
                }, {
                    text: "MVC-2",
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -2795,6 +2795,9 @@ li.CodeMirror-hint-active {
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-panel .panel-title {
+  background-color: #F2F4F7;
+}
 .bi-panel .panel-title .panel-title-text {
  cursor: text;
  font-size: 14px;
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -44045,7 +44045,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
            var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
            return BI.extend(conf, {
                baseCls: (conf.baseCls || "") + " bi-button",
-                minWidth: (props.block === true || props.clear === true) ? 0 : 90,
+                minWidth: (props.block === true || props.clear === true) ? 0 : 80,
                shadow: props.clear !== true,
                isShadowShowingOnSelected: true,
                readonly: true,
@ -69536,6 +69536,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
        return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
            baseClass: "bi-icon-text-value-combo",
            height: 30,
+            iconHeight: null,
+            iconWidth: null,
            value: ""
        });
    },
@ -69548,12 +69550,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
            items: o.items,
            height: o.height,
            text: o.text,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup = BI.createWidget({
            type: "bi.icon_text_value_combo_popup",
            items: o.items,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
            self.setValue(self.popup.getValue());
@ -69611,7 +69617,9 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
            type: "bi.button_group",
            items: BI.createItems(o.items, {
                type: "bi.single_select_icon_text_item",
-                height: 30
+                height: 30,
+                iconHeight: o.iconHeight,
+                iconWidth: o.iconWidth
            }),
            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
            layouts: [{
@ -72435,7 +72443,7 @@ BI.Panel = BI.inherit(BI.Widget, {
        return {
            el: {
                type: "bi.left_right_vertical_adapt",
-                cls: "panel-title bi-border-bottom bi-background",
+                cls: "panel-title bi-border-bottom",
                height: 29,
                items: {
                    left: [this.text],
@ -72444,7 +72452,7 @@ BI.Panel = BI.inherit(BI.Widget, {
                lhgap: 10,
                rhgap: 10
            },
-            height: 30
+            height: 29
        };
    },

@ -78081,7 +78089,9 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
            baseCls: (conf.baseCls || "") + " bi-text-trigger",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -78113,6 +78123,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                    ref: function (_ref) {
                        self.icon = _ref;
                    },
+                    iconHeight: o.iconHeight,
+                    iconWidth: o.iconWidth,
                    disableSelected: true
                },
                width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height)
@ -78160,7 +78172,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
    _defaultConfig: function () {
        return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-select-text-trigger bi-border",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -78174,7 +78188,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
            element: this,
            text: obj.text,
            iconCls: obj.iconCls,
-            height: o.height
+            height: o.height,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
    },

--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@ -14,7 +14,7 @@
            var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
            return BI.extend(conf, {
                baseCls: (conf.baseCls || "") + " bi-button",
-                minWidth: (props.block === true || props.clear === true) ? 0 : 90,
+                minWidth: (props.block === true || props.clear === true) ? 0 : 80,
                shadow: props.clear !== true,
                isShadowShowingOnSelected: true,
                readonly: true,
--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@ -7,6 +7,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
        return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
            baseClass: "bi-icon-text-value-combo",
            height: 30,
+            iconHeight: null,
+            iconWidth: null,
            value: ""
        });
    },
@ -19,12 +21,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
            items: o.items,
            height: o.height,
            text: o.text,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup = BI.createWidget({
            type: "bi.icon_text_value_combo_popup",
            items: o.items,
-            value: o.value
+            value: o.value,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
        this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
            self.setValue(self.popup.getValue());
--- a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
@ -15,7 +15,9 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
            type: "bi.button_group",
            items: BI.createItems(o.items, {
                type: "bi.single_select_icon_text_item",
-                height: 30
+                height: 30,
+                iconHeight: o.iconHeight,
+                iconWidth: o.iconWidth
            }),
            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
            layouts: [{
--- a/src/case/layer/panel.js
+++ b/src/case/layer/panel.js
@ -57,7 +57,7 @@ BI.Panel = BI.inherit(BI.Widget, {
        return {
            el: {
                type: "bi.left_right_vertical_adapt",
-                cls: "panel-title bi-border-bottom bi-background",
+                cls: "panel-title bi-border-bottom",
                height: 29,
                items: {
                    left: [this.text],
@ -66,7 +66,7 @@ BI.Panel = BI.inherit(BI.Widget, {
                lhgap: 10,
                rhgap: 10
            },
-            height: 30
+            height: 29
        };
    },

--- a/src/case/trigger/trigger.icon.text.js
+++ b/src/case/trigger/trigger.icon.text.js
@ -14,7 +14,9 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
            baseCls: (conf.baseCls || "") + " bi-text-trigger",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -46,6 +48,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                    ref: function (_ref) {
                        self.icon = _ref;
                    },
+                    iconHeight: o.iconHeight,
+                    iconWidth: o.iconWidth,
                    disableSelected: true
                },
                width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height)
--- a/src/case/trigger/trigger.icon.text.select.js
+++ b/src/case/trigger/trigger.icon.text.select.js
@ -6,7 +6,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
    _defaultConfig: function () {
        return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-select-text-trigger bi-border",
-            height: 24
+            height: 24,
+            iconHeight: null,
+            iconWidth: null
        });
    },

@ -20,7 +22,9 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
            element: this,
            text: obj.text,
            iconCls: obj.iconCls,
-            height: o.height
+            height: o.height,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
        });
    },

--- a/src/css/base/layer/panel.css
+++ b/src/css/base/layer/panel.css
@ -3,6 +3,9 @@
  -moz-border-radius: 2px;
  border-radius: 2px;
 }
+.bi-panel .panel-title {
+  background-color: #F2F4F7;
+}
 .bi-panel .panel-title .panel-title-text {
  cursor: text;
  font-size: 14px;
--- a/src/less/base/layer/panel.less
+++ b/src/less/base/layer/panel.less
@ -3,6 +3,7 @@
 .bi-panel{
  .border-radius(2px);
  .panel-title{
+    background-color: @color-bi-background-light-gray;
    & .panel-title-text{
      cursor: text;
      font-size: @font-size-14;
--- a/src/less/lib/colors.less
+++ b/src/less/lib/colors.less
@ -42,6 +42,8 @@
@color-bi-background-dark: @background-color-dark;
 //灰色背景
@color-bi-background-gray: @background-color-gray;
+//灰色背景(浅)
+@color-bi-background-light-gray: @background-color-light-gray;
 //灰化背景
@color-bi-background-disabled: @background-color-disabled;
 //成功背景色
--- a/src/less/lib/constant.less
+++ b/src/less/lib/constant.less
@ -38,6 +38,7 @@
@background-color-light-highlight: #eaf2fd;
@background-color-highlight: #3f8ce8;
@background-color-dark: #d4dadd;
+@background-color-light-gray: #F2F4F7;
@background-color-gray: #999999;
@background-color-disabled: #cccccc;