Browse Source

BI-30217 统一处理combo的灰化

es6
windy 6 years ago
parent
commit
1b7ae476bf
  1. 26
      dist/base.css
  2. 5
      dist/base.js
  3. 38
      dist/bundle.css
  4. 5
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 52
      dist/bundle.min.js
  7. 6
      dist/core.css
  8. 6
      dist/core_without_normalize.css
  9. 38
      dist/fineui.css
  10. 5
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 52
      dist/fineui.min.js
  13. 2
      dist/utils.min.js
  14. 6
      dist/widget.css
  15. 5
      src/base/combination/combo.js
  16. 14
      src/css/base/combo/combo.css
  17. 12
      src/css/base/editor/editor.css
  18. 6
      src/css/core/utils/common.css
  19. 6
      src/css/widget/numbereditor/number.css
  20. 21
      src/less/base/combo/combo.less
  21. 11
      src/less/base/editor/editor.search.less
  22. 11
      src/less/base/editor/editor.search.small.less
  23. 15
      src/less/core/utils/common.less
  24. 4
      src/less/lib/colors.less
  25. 1
      src/less/lib/constant.less
  26. 11
      src/less/widget/numbereditor/number.editor.less

26
dist/base.css vendored

@ -517,6 +517,20 @@
.bi-combo:hover > .bi-border { .bi-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-combo.disabled {
background-color: #F2F4F7;
}
.bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-combo.disabled:hover > .bi-border {
border-color: #e8eaed;
}
.bi-theme-dark .bi-combo.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button { .bi-search-text-value-combo .trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -559,6 +573,12 @@
.bi-search-editor .search-font { .bi-search-editor .search-font {
font-size: 16px; font-size: 16px;
} }
.bi-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-search-editor.disabled {
background-color: #2F3149;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor { .bi-small-search-editor .bi-editor {
@ -576,6 +596,12 @@
.bi-small-search-editor .search-font { .bi-small-search-editor .search-font {
font-size: 18px; font-size: 18px;
} }
.bi-small-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-small-search-editor.disabled {
background-color: #2F3149;
}
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;

5
dist/base.js vendored

@ -3303,6 +3303,11 @@ BI.Combo = BI.inherit(BI.Widget, {
_setEnable: function (arg) { _setEnable: function (arg) {
BI.Combo.superclass._setEnable.apply(this, arguments); BI.Combo.superclass._setEnable.apply(this, arguments);
if (arg === true) {
this.element.removeClass("base-disabled disabled");
} else if (arg === false) {
this.element.addClass("base-disabled disabled");
}
!arg && this.element.removeClass(this.options.hoverClass); !arg && this.element.removeClass(this.options.hoverClass);
!arg && this.isViewVisible() && this._hideView(); !arg && this.isViewVisible() && this._hideView();
}, },

38
dist/bundle.css vendored

@ -317,6 +317,12 @@ textarea {
.bi-focus-shadow:hover { .bi-focus-shadow:hover {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-focus-shadow.disabled:hover {
border-color: #e8eaed;
}
.bi-theme-dark .bi-focus-shadow.disabled:hover {
border-color: #3a3c53;
}
.base-invalid { .base-invalid {
cursor: default !important; cursor: default !important;
} }
@ -2447,6 +2453,20 @@ textarea {
.bi-combo:hover > .bi-border { .bi-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-combo.disabled {
background-color: #F2F4F7;
}
.bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-combo.disabled:hover > .bi-border {
border-color: #e8eaed;
}
.bi-theme-dark .bi-combo.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button { .bi-search-text-value-combo .trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -2489,6 +2509,12 @@ textarea {
.bi-search-editor .search-font { .bi-search-editor .search-font {
font-size: 16px; font-size: 16px;
} }
.bi-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-search-editor.disabled {
background-color: #2F3149;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor { .bi-small-search-editor .bi-editor {
@ -2506,6 +2532,12 @@ textarea {
.bi-small-search-editor .search-font { .bi-small-search-editor .search-font {
font-size: 18px; font-size: 18px;
} }
.bi-small-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-small-search-editor.disabled {
background-color: #2F3149;
}
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
@ -3597,6 +3629,12 @@ ul.ztree.zTreeDragUL {
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-number-editor.disabled {
background-color: #2F3149;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

5
dist/bundle.js vendored

@ -38575,6 +38575,11 @@ BI.Combo = BI.inherit(BI.Widget, {
_setEnable: function (arg) { _setEnable: function (arg) {
BI.Combo.superclass._setEnable.apply(this, arguments); BI.Combo.superclass._setEnable.apply(this, arguments);
if (arg === true) {
this.element.removeClass("base-disabled disabled");
} else if (arg === false) {
this.element.addClass("base-disabled disabled");
}
!arg && this.element.removeClass(this.options.hoverClass); !arg && this.element.removeClass(this.options.hoverClass);
!arg && this.isViewVisible() && this._hideView(); !arg && this.isViewVisible() && this._hideView();
}, },

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

52
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/core.css vendored

@ -317,6 +317,12 @@ textarea {
.bi-focus-shadow:hover { .bi-focus-shadow:hover {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-focus-shadow.disabled:hover {
border-color: #e8eaed;
}
.bi-theme-dark .bi-focus-shadow.disabled:hover {
border-color: #3a3c53;
}
.base-invalid { .base-invalid {
cursor: default !important; cursor: default !important;
} }

6
dist/core_without_normalize.css vendored

@ -36,6 +36,12 @@ textarea {
.bi-focus-shadow:hover { .bi-focus-shadow:hover {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-focus-shadow.disabled:hover {
border-color: #e8eaed;
}
.bi-theme-dark .bi-focus-shadow.disabled:hover {
border-color: #3a3c53;
}
.base-invalid { .base-invalid {
cursor: default !important; cursor: default !important;
} }

38
dist/fineui.css vendored

@ -317,6 +317,12 @@ textarea {
.bi-focus-shadow:hover { .bi-focus-shadow:hover {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-focus-shadow.disabled:hover {
border-color: #e8eaed;
}
.bi-theme-dark .bi-focus-shadow.disabled:hover {
border-color: #3a3c53;
}
.base-invalid { .base-invalid {
cursor: default !important; cursor: default !important;
} }
@ -2447,6 +2453,20 @@ textarea {
.bi-combo:hover > .bi-border { .bi-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-combo.disabled {
background-color: #F2F4F7;
}
.bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-combo.disabled:hover > .bi-border {
border-color: #e8eaed;
}
.bi-theme-dark .bi-combo.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button { .bi-search-text-value-combo .trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -2489,6 +2509,12 @@ textarea {
.bi-search-editor .search-font { .bi-search-editor .search-font {
font-size: 16px; font-size: 16px;
} }
.bi-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-search-editor.disabled {
background-color: #2F3149;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor { .bi-small-search-editor .bi-editor {
@ -2506,6 +2532,12 @@ textarea {
.bi-small-search-editor .search-font { .bi-small-search-editor .search-font {
font-size: 18px; font-size: 18px;
} }
.bi-small-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-small-search-editor.disabled {
background-color: #2F3149;
}
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
@ -3597,6 +3629,12 @@ ul.ztree.zTreeDragUL {
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-number-editor.disabled {
background-color: #2F3149;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

5
dist/fineui.js vendored

@ -38796,6 +38796,11 @@ BI.Combo = BI.inherit(BI.Widget, {
_setEnable: function (arg) { _setEnable: function (arg) {
BI.Combo.superclass._setEnable.apply(this, arguments); BI.Combo.superclass._setEnable.apply(this, arguments);
if (arg === true) {
this.element.removeClass("base-disabled disabled");
} else if (arg === false) {
this.element.addClass("base-disabled disabled");
}
!arg && this.element.removeClass(this.options.hoverClass); !arg && this.element.removeClass(this.options.hoverClass);
!arg && this.isViewVisible() && this._hideView(); !arg && this.isViewVisible() && this._hideView();
}, },

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

52
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/widget.css vendored

@ -121,6 +121,12 @@
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-number-editor.disabled {
background-color: #2F3149;
}
.bi-number-interval .number-interval-small-editor { .bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px; -moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px; -webkit-border-top-left-radius: 2px;

5
src/base/combination/combo.js

@ -413,6 +413,11 @@ BI.Combo = BI.inherit(BI.Widget, {
_setEnable: function (arg) { _setEnable: function (arg) {
BI.Combo.superclass._setEnable.apply(this, arguments); BI.Combo.superclass._setEnable.apply(this, arguments);
if (arg === true) {
this.element.removeClass("base-disabled disabled");
} else if (arg === false) {
this.element.addClass("base-disabled disabled");
}
!arg && this.element.removeClass(this.options.hoverClass); !arg && this.element.removeClass(this.options.hoverClass);
!arg && this.isViewVisible() && this._hideView(); !arg && this.isViewVisible() && this._hideView();
}, },

14
src/css/base/combo/combo.css

@ -93,6 +93,20 @@
.bi-combo:hover > .bi-border { .bi-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-combo.disabled {
background-color: #F2F4F7;
}
.bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-combo.disabled:hover > .bi-border {
border-color: #e8eaed;
}
.bi-theme-dark .bi-combo.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button { .bi-search-text-value-combo .trigger-icon-button {
font-size: 16px; font-size: 16px;

12
src/css/base/editor/editor.css

@ -10,6 +10,12 @@
.bi-search-editor .search-font { .bi-search-editor .search-font {
font-size: 16px; font-size: 16px;
} }
.bi-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-search-editor.disabled {
background-color: #2F3149;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor { .bi-small-search-editor .bi-editor {
@ -27,3 +33,9 @@
.bi-small-search-editor .search-font { .bi-small-search-editor .search-font {
font-size: 18px; font-size: 18px;
} }
.bi-small-search-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-small-search-editor.disabled {
background-color: #2F3149;
}

6
src/css/core/utils/common.css

@ -36,6 +36,12 @@ textarea {
.bi-focus-shadow:hover { .bi-focus-shadow:hover {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-focus-shadow.disabled:hover {
border-color: #e8eaed;
}
.bi-theme-dark .bi-focus-shadow.disabled:hover {
border-color: #3a3c53;
}
.base-invalid { .base-invalid {
cursor: default !important; cursor: default !important;
} }

6
src/css/widget/numbereditor/number.css

@ -9,3 +9,9 @@
.bi-number-editor .pull-up-font { .bi-number-editor .pull-up-font {
font-size: 12px; font-size: 12px;
} }
.bi-number-editor.disabled {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-number-editor.disabled {
background-color: #2F3149;
}

21
src/less/base/combo/combo.less

@ -16,4 +16,25 @@
border-color: @color-bi-border-highlight; border-color: @color-bi-border-highlight;
} }
} }
&.disabled {
background-color: @color-bi-background-disabled;
&.bi-combo-hover, &:hover {
& > .bi-border {
border-color: @border-color-line;
}
}
}
}
.bi-theme-dark {
.bi-combo {
&.disabled {
background-color: @color-bi-background-disabled-theme-dark;
&.bi-combo-hover, &:hover {
& > .bi-border {
border-color: @border-color-line-theme-dark;
}
}
}
}
} }

11
src/less/base/editor/editor.search.less

@ -8,4 +8,15 @@
& .search-font{ & .search-font{
font-size: @font-size-16; font-size: @font-size-16;
} }
&.disabled {
background-color: @color-bi-background-disabled;
}
}
.bi-theme-dark {
.bi-search-editor {
&.disabled {
background-color: @color-bi-background-disabled-theme-dark;
}
}
} }

11
src/less/base/editor/editor.search.small.less

@ -16,4 +16,15 @@
& .search-font{ & .search-font{
font-size: 18px; font-size: 18px;
} }
&.disabled {
background-color: @color-bi-background-disabled;
}
}
.bi-theme-dark {
.bi-small-search-editor {
&.disabled {
background-color: @color-bi-background-disabled-theme-dark;
}
}
} }

15
src/less/core/utils/common.less

@ -45,6 +45,21 @@ textarea {
&:focus-within, &:focus, &:hover { &:focus-within, &:focus, &:hover {
border-color: @color-bi-border-highlight; border-color: @color-bi-border-highlight;
} }
&.disabled {
&:hover {
border-color: @border-color-line;
}
}
}
.bi-theme-dark {
.bi-focus-shadow {
&.disabled {
&:hover {
border-color: @border-color-line-theme-dark;
}
}
}
} }
.base-invalid { .base-invalid {

4
src/less/lib/colors.less

@ -52,6 +52,8 @@
@color-bi-background-light-gray-theme-dark: @background-color-light-gray-theme-dark; @color-bi-background-light-gray-theme-dark: @background-color-light-gray-theme-dark;
//灰化背景 //灰化背景
@color-bi-background-disabled: @background-color-disabled; @color-bi-background-disabled: @background-color-disabled;
//深色主题灰化背景
@color-bi-background-disabled-theme-dark: @background-color-disabled-theme-dark;
//成功背景色 //成功背景色
@color-bi-background-success: @background-color-dark-success; @color-bi-background-success: @background-color-dark-success;
//成功背景色(浅) //成功背景色(浅)
@ -77,7 +79,7 @@
@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-disabled: @border-color-disabled;
//成功边框色 //成功边框色
@color-bi-border-success: @border-color-success; @color-bi-border-success: @border-color-success;

1
src/less/lib/constant.less

@ -61,6 +61,7 @@
@background-color-light-gray-theme-dark: #2F3149; @background-color-light-gray-theme-dark: #2F3149;
@background-color-dark-gray: #d0d4da; @background-color-dark-gray: #d0d4da;
@background-color-disabled: #F2F4F7; @background-color-disabled: #F2F4F7;
@background-color-disabled-theme-dark: #2F3149;
@background-color-yellow: #ffc101;// @background-color-yellow: #ffc101;//
@background-color-negative: #ff4949; @background-color-negative: #ff4949;

11
src/less/widget/numbereditor/number.editor.less

@ -8,4 +8,15 @@
& .pull-up-font { & .pull-up-font {
font-size: 12px; font-size: 12px;
} }
&.disabled {
background-color: @color-bi-background-disabled;
}
}
.bi-theme-dark {
.bi-number-editor {
&.disabled {
background-color: @color-bi-background-disabled-theme-dark;
}
}
} }
Loading…
Cancel
Save