Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #467 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '90d87b9c9bae154a22eb2f7fa3af221b7a380d1b':
  update
  BI-24616
master
fay 7 years ago
parent
b86b5a13ea 90d87b9c9b
commit
5ecf0078a6
18 changed files with 308 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      dist/_fineui.min.js
  2. 2
      dist/base.js
  3. 49
      dist/bundle.css
  4. 4
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 4
      dist/bundle.min.js
  7. 49
      dist/core.css
  8. 49
      dist/core_without_normalize.css
  9. 49
      dist/fineui.css
  10. 4
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 6
      dist/fineui.min.js
  13. 2
      dist/widget.js
  14. 2
      src/base/single/tip/tip.bubble.js
  15. 1
      src/component/allvaluechooser/combo.allvaluechooser.js
  16. 1
      src/component/valuechooser/combo.valuechooser.js
  17. 49
      src/css/core/utils/common.css
  18. 43
      src/less/core/utils/common.less

6
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/base.js vendored
Unescape View File

@ -20523,7 +20523,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level),
text: o.text,
hgap: 10,
hgap: 5,
height: 18
}));
},

49
dist/bundle.css vendored
Unescape View File

@ -932,6 +932,55 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);

4
dist/bundle.js vendored
Unescape View File

@ -56293,7 +56293,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level),
text: o.text,
hgap: 10,
hgap: 5,
height: 18
}));
},
@ -112778,6 +112778,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
text: o.text,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@ -113769,6 +113770,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

49
dist/core.css vendored
Unescape View File

@ -932,6 +932,55 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);

49
dist/core_without_normalize.css vendored
Unescape View File

@ -654,6 +654,55 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);

49
dist/fineui.css vendored
Unescape View File

@ -932,6 +932,55 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);

4
dist/fineui.js vendored
Unescape View File

@ -56536,7 +56536,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level),
text: o.text,
hgap: 10,
hgap: 5,
height: 18
}));
},
@ -113021,6 +113021,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
text: o.text,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@ -114012,6 +114013,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/widget.js vendored
Unescape View File

@ -25126,6 +25126,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
text: o.text,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@ -26117,6 +26118,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,

2
src/base/single/tip/tip.bubble.js
Unescape View File

@ -36,7 +36,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level),
text: o.text,
hgap: 10,
hgap: 5,
height: 18
}));
},

1
src/component/allvaluechooser/combo.allvaluechooser.js
Unescape View File

@ -27,6 +27,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
text: o.text,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),

1
src/component/valuechooser/combo.valuechooser.js
Unescape View File

@ -28,6 +28,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({
type: "bi.multi_select_combo",
element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,

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

@ -654,6 +654,55 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);

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

@ -484,7 +484,7 @@ textarea {
}
}
//文字和背景hover和active时变化
//文字和背景hover和active时变化, hover和点击时文本和背景变化，active后文本变化，背景不变化
.bi-list-item-active {
&:hover, &.hover {
color: @color-bi-text-black;
@ -572,7 +572,7 @@ textarea {
}
}
//文字和背景hover和active时变化
//文字和背景hover和active时变化 hover和点击时边框变化，active后背景和边框变化
.bi-list-item-active2 {
&:hover, &.hover {
color: @color-bi-text-black;
@ -668,6 +668,45 @@ textarea {
}
}
//文字和背景hover和active时变化 hover
.bi-list-item-active3 {
&:hover, &.hover {
color: @color-bi-text-black;
& .bi-input {
color: @color-bi-text-black;
}
& .bi-textarea {
color: @color-bi-text-black;
}
.background-color(@color-bi-background-highlight, 6%);
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 6%);
}
&.disabled {
&, &:hover, &:active {
background-color: transparent !important;
color: @color-bi-text-disabled !important;
& .bi-input {
color: @color-bi-text-disabled !important;
}
& .bi-textarea {
color: @color-bi-text-disabled !important;
}
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
// 激活和选中时背景高亮
.bi-list-item-select {
&:hover, &.hover {

Write Preview
Loading…
Cancel
Save