fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

add

es6
guy 8 years ago
parent
9c99f469dd
commit
be8e9a5aaa
21 changed files with 380 additions and 217 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      bi/base.css
  2. 18
      bi/base.js
  3. 12
      bi/case.js
  4. 4
      bi/core.css
  5. 1
      bi/widget.js
  6. 64
      demo/js/base/button/demo.button.js
  7. 84
      docs/base.css
  8. 18
      docs/base.js
  9. 12
      docs/case.js
  10. 4
      docs/core.css
  11. 64
      docs/demo.js
  12. 1
      docs/widget.js
  13. 18
      src/base/single/button/buttons/button.js
  14. 12
      src/case/editor/editor.state.js
  15. 84
      src/css/base/single/button/button.css
  16. 4
      src/css/core/utils/common.css
  17. 66
      src/less/base/single/button/button.less
  18. 2
      src/less/core/utils/common.less
  19. 9
      src/less/lib/colors.less
  20. 7
      src/less/lib/constant.less
  21. 1
      src/widget/multiselect/multiselect.combo.js

84
bi/base.css
Unescape View File

@ -714,72 +714,80 @@ li.CodeMirror-hint-active {
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
} }
.bi-button.button-common, .bi-button.clear {
.bi-button.button-common .b-font { border-width: 0;
color: #ffffff; background-color: transparent;
} }
.bi-button.button-common .b-font:before { .bi-button.clear:hover,
.bi-button.clear:active {
opacity: 0.75;
filter: alpha(opacity=75);
}
.bi-button.button-common {
color: #ffffff; color: #ffffff;
} }
.bi-button.button-common.clear {
color: #3f8ce8;
}
.bi-button.button-ignore { .bi-button.button-ignore {
color: #1a1a1a;
background-color: #ffffff; background-color: #ffffff;
border-color: #d4dadd; border-color: #d4dadd;
} }
.bi-button.button-ignore, .bi-button.button-ignore.clear {
.bi-button.button-ignore .b-font { background-color: transparent;
color: #1a1a1a; border-width: 0;
} }
.bi-button.button-success { .bi-button.button-success {
color: #ffffff;
background-color: #58cc7d; background-color: #58cc7d;
border-color: #58cc7d; border-color: #58cc7d;
} }
.bi-button.button-success, .bi-button.button-success.clear {
.bi-button.button-success .b-font { color: #0c6d23;
color: #ffffff; background-color: transparent;
} border-width: 0;
.bi-button.button-success .b-font:before {
color: #ffffff;
} }
.bi-button.button-warning { .bi-button.button-warning {
color: #ffffff;
background-color: #e85050; background-color: #e85050;
border-color: #e85050; border-color: #e85050;
} }
.bi-button.button-warning, .bi-button.button-warning.clear {
.bi-button.button-warning .b-font { color: #e85050;
color: #ffffff; background-color: transparent;
} border-width: 0;
.bi-button.button-warning .b-font:before {
color: #ffffff;
} }
.bi-button.button-common.disabled, .bi-button.button-common.disabled,
.bi-button.button-success.disabled, .bi-button.button-success.disabled,
.bi-button.button-warning.disabled { .bi-button.button-warning.disabled {
background: #cccccc !important;
border-color: #c4c6c6 !important;
}
.bi-button.button-common.disabled,
.bi-button.button-success.disabled,
.bi-button.button-warning.disabled,
.bi-button.button-common.disabled .b-font,
.bi-button.button-success.disabled .b-font,
.bi-button.button-warning.disabled .b-font {
color: #ffffff !important;
}
.bi-button.button-common.disabled .b-font:before,
.bi-button.button-success.disabled .b-font:before,
.bi-button.button-warning.disabled .b-font:before {
color: #ffffff !important; color: #ffffff !important;
background: #cccccc !important;
border-color: #cccccc !important;
} }
.bi-button.button-ignore.disabled { .bi-button.button-ignore.disabled {
color: #cccccc !important;
background: #ffffff !important; background: #ffffff !important;
border-color: #d4dadd !important; border-color: #d4dadd !important;
} }
.bi-button.button-ignore.disabled, .bi-button.button-common.disabled.clear,
.bi-button.button-ignore.disabled .b-font { .bi-button.button-success.disabled.clear,
color: #cccccc !important; .bi-button.button-warning.disabled.clear,
} .bi-button.button-ignore.disabled.clear {
.bi-button.button-ignore.disabled .b-font:before {
color: #cccccc !important; color: #cccccc !important;
background: transparent !important;
border-width: 0 !important;
}
.bi-button.button-common.disabled.clear:hover,
.bi-button.button-success.disabled.clear:hover,
.bi-button.button-warning.disabled.clear:hover,
.bi-button.button-ignore.disabled.clear:hover,
.bi-button.button-common.disabled.clear:active,
.bi-button.button-success.disabled.clear:active,
.bi-button.button-warning.disabled.clear:active,
.bi-button.button-ignore.disabled.clear:active {
opacity: 1;
filter: alpha(opacity=100);
} }
.bi-basic-button.button-common .bi-button-mask, .bi-basic-button.button-common .bi-button-mask,
.bi-basic-button.button-success .bi-button-mask, .bi-basic-button.button-success .bi-button-mask,

18
bi/base.js
Unescape View File

@ -15883,25 +15883,24 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
* @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景 * @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景
*/ */
BI.Button = BI.inherit(BI.BasicButton, { BI.Button = BI.inherit(BI.BasicButton, {
_const: {
minWidth: 90
},
_defaultConfig: function () { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + ' bi-button', baseCls: (conf.baseCls || "") + ' bi-button',
shadow: true, minWidth: props.clear === true ? 0 : 90,
shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,
iconClass: "", iconClass: "",
level: 'common', level: 'common',
clear: false, //是否去掉边框和背景
textAlign: "center", textAlign: "center",
whiteSpace: "nowrap", whiteSpace: "nowrap",
forceCenter: false, forceCenter: false,
textWidth: null, textWidth: null,
textHeight: null, textHeight: null,
hgap: 10, hgap: props.clear ? 0 : 10,
vgap: 0, vgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
@ -15961,7 +15960,12 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
value: o.value value: o.value
}); });
} }
this.element.css({"min-width": this._const.minWidth - 2 + "px"}); if (o.clear === true) {
this.element.addClass("clear");
}
if (o.minWidth > 2) {
this.element.css({"min-width": o.minWidth - 2 + "px"});
}
}, },
doClick: function () { doClick: function () {

12
bi/case.js
Unescape View File

@ -6349,15 +6349,15 @@ BI.StateEditor = BI.inherit(BI.Single, {
return; return;
} }
if (BI.isString(v)) { if (BI.isString(v)) {
if (BI.isEmpty(v)) { // if (BI.isEmpty(v)) {
this.text.setText(BI.i18nText("BI-Basic_Unrestricted")); // this.text.setText(BI.i18nText("BI-Basic_Unrestricted"));
this.text.setTitle(""); // this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text"); // this.text.element.addClass("state-editor-infinite-text");
} else { // } else {
this.text.setText(v); this.text.setText(v);
this.text.setTitle(v); this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text"); this.text.element.removeClass("state-editor-infinite-text");
} // }
return; return;
} }
if (BI.isArray(v)) { if (BI.isArray(v)) {

4
bi/core.css
Unescape View File

@ -3078,8 +3078,8 @@ i {
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff; color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d1a1a1a,endColorstr=#4d1a1a1a);
} }
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {

1
bi/widget.js
Unescape View File

@ -9861,7 +9861,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.storeValue = v || {}; this.storeValue = v || {};
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.combo.setValue(this.storeValue); this.combo.setValue(this.storeValue);
this.trigger.setValue(this.storeValue);
}, },
getValue: function () { getValue: function () {

64
demo/js/base/button/demo.button.js
Unescape View File

@ -54,7 +54,67 @@ Demo.Button = BI.inherit(BI.Widget, {
type: 'bi.button', type: 'bi.button',
text: '带图标的按钮', text: '带图标的按钮',
//level: 'ignore', //level: 'ignore',
iconClass: "rename-font", iconClass: "close-font",
height: 30
}
}, {
el: {
type: 'bi.button',
text: '一般按钮',
clear: true,
level: 'common',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '表示成功状态按钮',
clear: true,
level: 'success',
height: 30
}
},
{
el: {
type: 'bi.button',
text: '表示警告状态的按钮',
clear: true,
level: 'warning',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '表示忽略状态的按钮',
clear: true,
level: 'ignore',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '普通灰化按钮',
clear: true,
disabled: true,
level: 'success',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '忽略状态灰化按钮',
clear: true,
disabled: true,
level: 'ignore',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '带图标的按钮',
clear: true,
//level: 'ignore',
iconClass: "close-font",
height: 30 height: 30
} }
} }
@ -66,7 +126,7 @@ Demo.Button = BI.inherit(BI.Widget, {
}); });
return { return {
type: "bi.left", type: "bi.left",
vgap: 200, vgap: 100,
hgap: 20, hgap: 20,
items: items items: items
} }

84
docs/base.css
Unescape View File

@ -714,72 +714,80 @@ li.CodeMirror-hint-active {
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
} }
.bi-button.button-common, .bi-button.clear {
.bi-button.button-common .b-font { border-width: 0;
color: #ffffff; background-color: transparent;
} }
.bi-button.button-common .b-font:before { .bi-button.clear:hover,
.bi-button.clear:active {
opacity: 0.75;
filter: alpha(opacity=75);
}
.bi-button.button-common {
color: #ffffff; color: #ffffff;
} }
.bi-button.button-common.clear {
color: #3f8ce8;
}
.bi-button.button-ignore { .bi-button.button-ignore {
color: #1a1a1a;
background-color: #ffffff; background-color: #ffffff;
border-color: #d4dadd; border-color: #d4dadd;
} }
.bi-button.button-ignore, .bi-button.button-ignore.clear {
.bi-button.button-ignore .b-font { background-color: transparent;
color: #1a1a1a; border-width: 0;
} }
.bi-button.button-success { .bi-button.button-success {
color: #ffffff;
background-color: #58cc7d; background-color: #58cc7d;
border-color: #58cc7d; border-color: #58cc7d;
} }
.bi-button.button-success, .bi-button.button-success.clear {
.bi-button.button-success .b-font { color: #0c6d23;
color: #ffffff; background-color: transparent;
} border-width: 0;
.bi-button.button-success .b-font:before {
color: #ffffff;
} }
.bi-button.button-warning { .bi-button.button-warning {
color: #ffffff;
background-color: #e85050; background-color: #e85050;
border-color: #e85050; border-color: #e85050;
} }
.bi-button.button-warning, .bi-button.button-warning.clear {
.bi-button.button-warning .b-font { color: #e85050;
color: #ffffff; background-color: transparent;
} border-width: 0;
.bi-button.button-warning .b-font:before {
color: #ffffff;
} }
.bi-button.button-common.disabled, .bi-button.button-common.disabled,
.bi-button.button-success.disabled, .bi-button.button-success.disabled,
.bi-button.button-warning.disabled { .bi-button.button-warning.disabled {
background: #cccccc !important;
border-color: #c4c6c6 !important;
}
.bi-button.button-common.disabled,
.bi-button.button-success.disabled,
.bi-button.button-warning.disabled,
.bi-button.button-common.disabled .b-font,
.bi-button.button-success.disabled .b-font,
.bi-button.button-warning.disabled .b-font {
color: #ffffff !important;
}
.bi-button.button-common.disabled .b-font:before,
.bi-button.button-success.disabled .b-font:before,
.bi-button.button-warning.disabled .b-font:before {
color: #ffffff !important; color: #ffffff !important;
background: #cccccc !important;
border-color: #cccccc !important;
} }
.bi-button.button-ignore.disabled { .bi-button.button-ignore.disabled {
color: #cccccc !important;
background: #ffffff !important; background: #ffffff !important;
border-color: #d4dadd !important; border-color: #d4dadd !important;
} }
.bi-button.button-ignore.disabled, .bi-button.button-common.disabled.clear,
.bi-button.button-ignore.disabled .b-font { .bi-button.button-success.disabled.clear,
color: #cccccc !important; .bi-button.button-warning.disabled.clear,
} .bi-button.button-ignore.disabled.clear {
.bi-button.button-ignore.disabled .b-font:before {
color: #cccccc !important; color: #cccccc !important;
background: transparent !important;
border-width: 0 !important;
}
.bi-button.button-common.disabled.clear:hover,
.bi-button.button-success.disabled.clear:hover,
.bi-button.button-warning.disabled.clear:hover,
.bi-button.button-ignore.disabled.clear:hover,
.bi-button.button-common.disabled.clear:active,
.bi-button.button-success.disabled.clear:active,
.bi-button.button-warning.disabled.clear:active,
.bi-button.button-ignore.disabled.clear:active {
opacity: 1;
filter: alpha(opacity=100);
} }
.bi-basic-button.button-common .bi-button-mask, .bi-basic-button.button-common .bi-button-mask,
.bi-basic-button.button-success .bi-button-mask, .bi-basic-button.button-success .bi-button-mask,

18
docs/base.js
Unescape View File

@ -15883,25 +15883,24 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
* @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景 * @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景
*/ */
BI.Button = BI.inherit(BI.BasicButton, { BI.Button = BI.inherit(BI.BasicButton, {
_const: {
minWidth: 90
},
_defaultConfig: function () { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + ' bi-button', baseCls: (conf.baseCls || "") + ' bi-button',
shadow: true, minWidth: props.clear === true ? 0 : 90,
shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,
iconClass: "", iconClass: "",
level: 'common', level: 'common',
clear: false, //是否去掉边框和背景
textAlign: "center", textAlign: "center",
whiteSpace: "nowrap", whiteSpace: "nowrap",
forceCenter: false, forceCenter: false,
textWidth: null, textWidth: null,
textHeight: null, textHeight: null,
hgap: 10, hgap: props.clear ? 0 : 10,
vgap: 0, vgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
@ -15961,7 +15960,12 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
value: o.value value: o.value
}); });
} }
this.element.css({"min-width": this._const.minWidth - 2 + "px"}); if (o.clear === true) {
this.element.addClass("clear");
}
if (o.minWidth > 2) {
this.element.css({"min-width": o.minWidth - 2 + "px"});
}
}, },
doClick: function () { doClick: function () {

12
docs/case.js
Unescape View File

@ -6349,15 +6349,15 @@ BI.StateEditor = BI.inherit(BI.Single, {
return; return;
} }
if (BI.isString(v)) { if (BI.isString(v)) {
if (BI.isEmpty(v)) { // if (BI.isEmpty(v)) {
this.text.setText(BI.i18nText("BI-Basic_Unrestricted")); // this.text.setText(BI.i18nText("BI-Basic_Unrestricted"));
this.text.setTitle(""); // this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text"); // this.text.element.addClass("state-editor-infinite-text");
} else { // } else {
this.text.setText(v); this.text.setText(v);
this.text.setTitle(v); this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text"); this.text.element.removeClass("state-editor-infinite-text");
} // }
return; return;
} }
if (BI.isArray(v)) { if (BI.isArray(v)) {

4
docs/core.css
Unescape View File

@ -3078,8 +3078,8 @@ i {
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff; color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d1a1a1a,endColorstr=#4d1a1a1a);
} }
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {

64
docs/demo.js
Unescape View File

@ -75,7 +75,67 @@ BI.i18n = {};$(function () {
type: 'bi.button', type: 'bi.button',
text: '带图标的按钮', text: '带图标的按钮',
//level: 'ignore', //level: 'ignore',
iconClass: "rename-font", iconClass: "close-font",
height: 30
}
}, {
el: {
type: 'bi.button',
text: '一般按钮',
clear: true,
level: 'common',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '表示成功状态按钮',
clear: true,
level: 'success',
height: 30
}
},
{
el: {
type: 'bi.button',
text: '表示警告状态的按钮',
clear: true,
level: 'warning',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '表示忽略状态的按钮',
clear: true,
level: 'ignore',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '普通灰化按钮',
clear: true,
disabled: true,
level: 'success',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '忽略状态灰化按钮',
clear: true,
disabled: true,
level: 'ignore',
height: 30
}
}, {
el: {
type: 'bi.button',
text: '带图标的按钮',
clear: true,
//level: 'ignore',
iconClass: "close-font",
height: 30 height: 30
} }
} }
@ -87,7 +147,7 @@ BI.i18n = {};$(function () {
}); });
return { return {
type: "bi.left", type: "bi.left",
vgap: 200, vgap: 100,
hgap: 20, hgap: 20,
items: items items: items
} }

1
docs/widget.js
Unescape View File

@ -9861,7 +9861,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.storeValue = v || {}; this.storeValue = v || {};
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.combo.setValue(this.storeValue); this.combo.setValue(this.storeValue);
this.trigger.setValue(this.storeValue);
}, },
getValue: function () { getValue: function () {

18
src/base/single/button/buttons/button.js
Unescape View File

@ -9,25 +9,24 @@
* @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景 * @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景
*/ */
BI.Button = BI.inherit(BI.BasicButton, { BI.Button = BI.inherit(BI.BasicButton, {
_const: {
minWidth: 90
},
_defaultConfig: function () { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + ' bi-button', baseCls: (conf.baseCls || "") + ' bi-button',
shadow: true, minWidth: props.clear === true ? 0 : 90,
shadow: props.clear !== true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
readonly: true, readonly: true,
iconClass: "", iconClass: "",
level: 'common', level: 'common',
clear: false, //是否去掉边框和背景
textAlign: "center", textAlign: "center",
whiteSpace: "nowrap", whiteSpace: "nowrap",
forceCenter: false, forceCenter: false,
textWidth: null, textWidth: null,
textHeight: null, textHeight: null,
hgap: 10, hgap: props.clear ? 0 : 10,
vgap: 0, vgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
@ -87,7 +86,12 @@
value: o.value value: o.value
}); });
} }
this.element.css({"min-width": this._const.minWidth - 2 + "px"}); if (o.clear === true) {
this.element.addClass("clear");
}
if (o.minWidth > 2) {
this.element.css({"min-width": o.minWidth - 2 + "px"});
}
}, },
doClick: function () { doClick: function () {

12
src/case/editor/editor.state.js
Unescape View File

@ -233,15 +233,15 @@ BI.StateEditor = BI.inherit(BI.Single, {
return; return;
} }
if (BI.isString(v)) { if (BI.isString(v)) {
if (BI.isEmpty(v)) { // if (BI.isEmpty(v)) {
this.text.setText(BI.i18nText("BI-Basic_Unrestricted")); // this.text.setText(BI.i18nText("BI-Basic_Unrestricted"));
this.text.setTitle(""); // this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text"); // this.text.element.addClass("state-editor-infinite-text");
} else { // } else {
this.text.setText(v); this.text.setText(v);
this.text.setTitle(v); this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text"); this.text.element.removeClass("state-editor-infinite-text");
} // }
return; return;
} }
if (BI.isArray(v)) { if (BI.isArray(v)) {

84
src/css/base/single/button/button.css
Unescape View File

@ -12,72 +12,80 @@
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
} }
.bi-button.button-common, .bi-button.clear {
.bi-button.button-common .b-font { border-width: 0;
color: #ffffff; background-color: transparent;
}
.bi-button.clear:hover,
.bi-button.clear:active {
opacity: 0.75;
filter: alpha(opacity=75);
} }
.bi-button.button-common .b-font:before { .bi-button.button-common {
color: #ffffff; color: #ffffff;
} }
.bi-button.button-common.clear {
color: #3f8ce8;
}
.bi-button.button-ignore { .bi-button.button-ignore {
color: #1a1a1a;
background-color: #ffffff; background-color: #ffffff;
border-color: #d4dadd; border-color: #d4dadd;
} }
.bi-button.button-ignore, .bi-button.button-ignore.clear {
.bi-button.button-ignore .b-font { background-color: transparent;
color: #1a1a1a; border-width: 0;
} }
.bi-button.button-success { .bi-button.button-success {
color: #ffffff;
background-color: #58cc7d; background-color: #58cc7d;
border-color: #58cc7d; border-color: #58cc7d;
} }
.bi-button.button-success, .bi-button.button-success.clear {
.bi-button.button-success .b-font { color: #0c6d23;
color: #ffffff; background-color: transparent;
} border-width: 0;
.bi-button.button-success .b-font:before {
color: #ffffff;
} }
.bi-button.button-warning { .bi-button.button-warning {
color: #ffffff;
background-color: #e85050; background-color: #e85050;
border-color: #e85050; border-color: #e85050;
} }
.bi-button.button-warning, .bi-button.button-warning.clear {
.bi-button.button-warning .b-font { color: #e85050;
color: #ffffff; background-color: transparent;
} border-width: 0;
.bi-button.button-warning .b-font:before {
color: #ffffff;
} }
.bi-button.button-common.disabled, .bi-button.button-common.disabled,
.bi-button.button-success.disabled, .bi-button.button-success.disabled,
.bi-button.button-warning.disabled { .bi-button.button-warning.disabled {
background: #cccccc !important;
border-color: #c4c6c6 !important;
}
.bi-button.button-common.disabled,
.bi-button.button-success.disabled,
.bi-button.button-warning.disabled,
.bi-button.button-common.disabled .b-font,
.bi-button.button-success.disabled .b-font,
.bi-button.button-warning.disabled .b-font {
color: #ffffff !important;
}
.bi-button.button-common.disabled .b-font:before,
.bi-button.button-success.disabled .b-font:before,
.bi-button.button-warning.disabled .b-font:before {
color: #ffffff !important; color: #ffffff !important;
background: #cccccc !important;
border-color: #cccccc !important;
} }
.bi-button.button-ignore.disabled { .bi-button.button-ignore.disabled {
color: #cccccc !important;
background: #ffffff !important; background: #ffffff !important;
border-color: #d4dadd !important; border-color: #d4dadd !important;
} }
.bi-button.button-ignore.disabled, .bi-button.button-common.disabled.clear,
.bi-button.button-ignore.disabled .b-font { .bi-button.button-success.disabled.clear,
color: #cccccc !important; .bi-button.button-warning.disabled.clear,
} .bi-button.button-ignore.disabled.clear {
.bi-button.button-ignore.disabled .b-font:before {
color: #cccccc !important; color: #cccccc !important;
background: transparent !important;
border-width: 0 !important;
}
.bi-button.button-common.disabled.clear:hover,
.bi-button.button-success.disabled.clear:hover,
.bi-button.button-warning.disabled.clear:hover,
.bi-button.button-ignore.disabled.clear:hover,
.bi-button.button-common.disabled.clear:active,
.bi-button.button-success.disabled.clear:active,
.bi-button.button-warning.disabled.clear:active,
.bi-button.button-ignore.disabled.clear:active {
opacity: 1;
filter: alpha(opacity=100);
} }
.bi-basic-button.button-common .bi-button-mask, .bi-basic-button.button-common .bi-button-mask,
.bi-basic-button.button-success .bi-button-mask, .bi-basic-button.button-success .bi-button-mask,

4
src/css/core/utils/common.css
Unescape View File

@ -125,8 +125,8 @@
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff; color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d1a1a1a,endColorstr=#4d1a1a1a);
} }
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {

66
src/less/base/single/button/button.less
Unescape View File

@ -8,62 +8,80 @@
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
&.clear {
border-width: 0;
background-color: transparent;
&:hover, &:active {
.opacity(0.75);
}
}
&.button-common { &.button-common {
&, & .b-font { & {
color: @color-bi-text; color: @color-bi-text;
} }
& .b-font:before { &.clear {
color: @color-bi-text; color: @color-bi-text-highlight;
} }
} }
&.button-ignore { &.button-ignore {
&, & .b-font { & {
color: @color-bi-text-black; color: @color-bi-text-black;
}
background-color: @color-bi-background-default; background-color: @color-bi-background-default;
border-color: @color-bi-split-dark; border-color: @color-bi-border-line;
}
&.clear {
background-color: transparent;
border-width: 0;
}
} }
&.button-success { &.button-success {
&, & .b-font { & {
color: @color-bi-text; color: @color-bi-text;
}
background-color: @color-bi-background-success; background-color: @color-bi-background-success;
border-color: @color-bi-border-success; border-color: @color-bi-border-success;
& .b-font:before { }
color: @color-bi-text; &.clear {
color: @color-bi-text-success;
background-color: transparent;
border-width: 0;
} }
} }
&.button-warning { &.button-warning {
&, & .b-font { & {
color: @color-bi-text; color: @color-bi-text;
}
background-color: @color-bi-background-delete; background-color: @color-bi-background-delete;
border-color: @color-bi-border-delete; border-color: @color-bi-border-delete;
& .b-font:before { }
color: @color-bi-text; &.clear {
color: @color-bi-text-warning;
background-color: transparent;
border-width: 0;
} }
} }
&.button-common.disabled, &.button-common.disabled,
&.button-success.disabled, &.button-success.disabled,
&.button-warning.disabled { &.button-warning.disabled {
&, & .b-font {
color: @color-bi-text !important;
}
& .b-font:before {
color: @color-bi-text !important; color: @color-bi-text !important;
}
background: @color-bi-background-disabled !important; background: @color-bi-background-disabled !important;
border-color: @color-bi-split-disabled !important; border-color: @color-bi-border-disabled !important;
} }
&.button-ignore.disabled { &.button-ignore.disabled {
&, & .b-font {
color: @color-bi-text-disabled !important; color: @color-bi-text-disabled !important;
background: @color-bi-background-default !important;
border-color: @color-bi-border-line !important;
} }
& .b-font:before { &.button-common.disabled,
&.button-success.disabled,
&.button-warning.disabled,
&.button-ignore.disabled {
&.clear {
color: @color-bi-text-disabled !important; color: @color-bi-text-disabled !important;
background: transparent !important;
border-width: 0 !important;
&:hover, &:active {
.opacity(1);
}
} }
background: @color-bi-background-default !important;
border-color: @color-bi-split-dark !important;
} }
} }

2
src/less/core/utils/common.less
Unescape View File

@ -175,7 +175,7 @@
.bi-z-index-mask { .bi-z-index-mask {
color: @color-bi-background-default; color: @color-bi-background-default;
.background-color(@color-bi-background-black, 50%); .background-color(@color-bi-background-black, 30%);
} }
//只有背景变化 //只有背景变化

9
src/less/lib/colors.less
Unescape View File

@ -60,13 +60,6 @@
@color-bi-background-virtual-blue: @background-color-virtual-blue; @color-bi-background-virtual-blue: @background-color-virtual-blue;
//深灰色分割线
@color-bi-split-dark: @split-color-dark;
//浅灰色分割线
@color-bi-split-light: @split-color-light;
//灰化分割线
@color-bi-split-disabled: @split-color-disabled;
//黑色边框色 //黑色边框色
@color-bi-border-black: @border-color-black; @color-bi-border-black: @border-color-black;
//默认边框色 //默认边框色
@ -77,6 +70,8 @@
@color-bi-border-line: @border-color-line; @color-bi-border-line: @border-color-line;
//深色系边框线色 //深色系边框线色
@color-bi-border-line-theme-dark: @border-color-line-theme-dark; @color-bi-border-line-theme-dark: @border-color-line-theme-dark;
//灰化分割线
@color-bi-border-disabled: @border-color-disabled;
//成功边框色 //成功边框色
@color-bi-border-success: @border-color-success; @color-bi-border-success: @border-color-success;
//失败边框色 //失败边框色

7
src/less/lib/constant.less
Unescape View File

@ -68,7 +68,8 @@
@border-color-error: #f4cbcb; @border-color-error: #f4cbcb;
@border-color-normal-success: #eddea2; @border-color-normal-success: #eddea2;
@border-color-dark: #c4c6c6; //split color
@border-color-disabled: #cccccc;
//scroll color //scroll color
@scroll-color: #666666; @scroll-color: #666666;
@ -77,10 +78,6 @@
@water-mark-color: #cccccc; @water-mark-color: #cccccc;
@water-mark-color-theme-dark: #666666; @water-mark-color-theme-dark: #666666;
//split color
@split-color-light: #eaeaea;
@split-color-dark: #d4dadd;
@split-color-disabled: #c4c6c6;
//shadow color //shadow color
@shadow-color-black: #000000; @shadow-color-black: #000000;

1
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -328,7 +328,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.storeValue = v || {}; this.storeValue = v || {};
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.combo.setValue(this.storeValue); this.combo.setValue(this.storeValue);
this.trigger.setValue(this.storeValue);
}, },
getValue: function () { getValue: function () {

Write Preview
Loading…
Cancel
Save