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

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

* commit '8e3d5d8661366424f51ebcd2847c8a9710b7e10f':
  update
  update
  update
es6
windy 6 years ago
parent
56524d1657 8e3d5d8661
commit
8db2ce6f23
28 changed files with 134 additions and 71 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. 8
      dist/_fineui.min.js
  2. 10
      dist/base.css
  3. 26
      dist/bundle.css
  4. 10
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 12
      dist/bundle.min.js
  7. 4
      dist/core.css
  8. 4
      dist/core_without_normalize.css
  9. 26
      dist/fineui.css
  10. 10
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 8
      dist/fineui.min.js
  13. 12
      dist/widget.css
  14. 10
      dist/widget.js
  15. 10
      src/css/base/combo/combo.css
  16. 4
      src/css/core/utils/common.css
  17. 4
      src/css/widget/multiselect/multiselect.css
  18. 4
      src/css/widget/singleselect/multiselect.css
  19. 4
      src/css/widget/singletreecombo/singletreecombo.css
  20. 2
      src/less/base/combo/combo.less
  21. 2
      src/less/base/combo/combo.searchtextvalue.less
  22. 2
      src/less/base/combo/combo.textvalue.less
  23. 5
      src/less/core/utils/common.less
  24. 2
      src/less/widget/multiselect/multiselect.combo.less
  25. 10
      src/less/widget/singleselect/multiselect.combo.less
  26. 2
      src/less/widget/singletreecombo/singletreecombo.less
  27. 5
      src/widget/selecttree/selecttree.combo.js
  28. 5
      src/widget/singletree/singletree.combo.js

8
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/base.css vendored
Unescape View File

@ -423,7 +423,7 @@
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
.bi-combo.bi-combo-popup:focus-within {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
@ -447,8 +447,8 @@
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup .bi-search-text-value-trigger,
.bi-combo:hover .bi-search-text-value-trigger {
.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
.bi-combo:hover > .bi-search-text-value-trigger {
border-color: #3685f2;
}
@ -459,8 +459,8 @@
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-combo.bi-combo-popup .bi-select-text-trigger,
.bi-combo:hover .bi-select-text-trigger {
.bi-combo.bi-combo-popup > .bi-select-text-trigger,
.bi-combo:hover > .bi-select-text-trigger {
border-color: #3685f2;
}
/*************BI.SearchEditor******************/

26
dist/bundle.css vendored
Unescape View File

@ -313,13 +313,15 @@ textarea {
color: #606479 !important;
}
.bi-focus-shadow:focus-within,
.bi-focus-shadow:hover,
.bi-focus-shadow:focus {
border-color: #3685f2;
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-focus-shadow:hover {
border-color: #3685f2;
}
.base-invalid {
cursor: default !important;
}
@ -2283,7 +2285,7 @@ textarea {
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
.bi-combo.bi-combo-popup:focus-within {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
@ -2307,8 +2309,8 @@ textarea {
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup .bi-search-text-value-trigger,
.bi-combo:hover .bi-search-text-value-trigger {
.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
.bi-combo:hover > .bi-search-text-value-trigger {
border-color: #3685f2;
}
@ -2319,8 +2321,8 @@ textarea {
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-combo.bi-combo-popup .bi-select-text-trigger,
.bi-combo:hover .bi-select-text-trigger {
.bi-combo.bi-combo-popup > .bi-select-text-trigger,
.bi-combo:hover > .bi-select-text-trigger {
border-color: #3685f2;
}
/*************BI.SearchEditor******************/
@ -4253,8 +4255,8 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover .bi-multi-select-trigger {
.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
border-color: #3685f2;
}
@ -4510,6 +4512,10 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
border-color: #3685f2;
}
.bi-single-slider-label {
min-height: 50px;
}
@ -4571,8 +4577,8 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-combo.bi-combo-popup:focus .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover .bi-single-tree-trigger {
.bi-combo.bi-combo-popup:focus > .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-tree-trigger {
border-color: #3685f2;
}
.bi-date-interval.time-error .bi-input {

10
dist/bundle.js vendored
Unescape View File

@ -105712,7 +105712,10 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
height: 30,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -109439,7 +109442,10 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
height: 24,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

12
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/core.css vendored
Unescape View File

@ -313,13 +313,15 @@ textarea {
color: #606479 !important;
}
.bi-focus-shadow:focus-within,
.bi-focus-shadow:hover,
.bi-focus-shadow:focus {
border-color: #3685f2;
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-focus-shadow:hover {
border-color: #3685f2;
}
.base-invalid {
cursor: default !important;
}

4
dist/core_without_normalize.css vendored
Unescape View File

@ -32,13 +32,15 @@ textarea {
color: #606479 !important;
}
.bi-focus-shadow:focus-within,
.bi-focus-shadow:hover,
.bi-focus-shadow:focus {
border-color: #3685f2;
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-focus-shadow:hover {
border-color: #3685f2;
}
.base-invalid {
cursor: default !important;
}

26
dist/fineui.css vendored
Unescape View File

@ -313,13 +313,15 @@ textarea {
color: #606479 !important;
}
.bi-focus-shadow:focus-within,
.bi-focus-shadow:hover,
.bi-focus-shadow:focus {
border-color: #3685f2;
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-focus-shadow:hover {
border-color: #3685f2;
}
.base-invalid {
cursor: default !important;
}
@ -2283,7 +2285,7 @@ textarea {
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
.bi-combo.bi-combo-popup:focus-within {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
@ -2307,8 +2309,8 @@ textarea {
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup .bi-search-text-value-trigger,
.bi-combo:hover .bi-search-text-value-trigger {
.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
.bi-combo:hover > .bi-search-text-value-trigger {
border-color: #3685f2;
}
@ -2319,8 +2321,8 @@ textarea {
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-combo.bi-combo-popup .bi-select-text-trigger,
.bi-combo:hover .bi-select-text-trigger {
.bi-combo.bi-combo-popup > .bi-select-text-trigger,
.bi-combo:hover > .bi-select-text-trigger {
border-color: #3685f2;
}
/*************BI.SearchEditor******************/
@ -4253,8 +4255,8 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover .bi-multi-select-trigger {
.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
border-color: #3685f2;
}
@ -4510,6 +4512,10 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
border-color: #3685f2;
}
.bi-single-slider-label {
min-height: 50px;
}
@ -4571,8 +4577,8 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-combo.bi-combo-popup:focus .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover .bi-single-tree-trigger {
.bi-combo.bi-combo-popup:focus > .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-tree-trigger {
border-color: #3685f2;
}
.bi-date-interval.time-error .bi-input {

10
dist/fineui.js vendored
Unescape View File

@ -105933,7 +105933,10 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
height: 30,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -109660,7 +109663,10 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
height: 24,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/widget.css vendored
Unescape View File

@ -117,8 +117,8 @@
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover .bi-multi-select-trigger {
.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
border-color: #3685f2;
}
@ -374,6 +374,10 @@
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
border-color: #3685f2;
}
.bi-single-slider-label {
min-height: 50px;
}
@ -435,8 +439,8 @@
-moz-border-radius: 3px;
border-radius: 3px;
}
.bi-combo.bi-combo-popup:focus .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover .bi-single-tree-trigger {
.bi-combo.bi-combo-popup:focus > .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-tree-trigger {
border-color: #3685f2;
}
.bi-date-interval.time-error .bi-input {

10
dist/widget.js vendored
Unescape View File

@ -17455,7 +17455,10 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
height: 30,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -21182,7 +21185,10 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
height: 24,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},

10
src/css/base/combo/combo.css
Unescape View File

@ -90,7 +90,7 @@
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
.bi-combo.bi-combo-popup:focus-within {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
@ -114,8 +114,8 @@
.bi-search-text-value-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup .bi-search-text-value-trigger,
.bi-combo:hover .bi-search-text-value-trigger {
.bi-combo.bi-combo-popup > .bi-search-text-value-trigger,
.bi-combo:hover > .bi-search-text-value-trigger {
border-color: #3685f2;
}
@ -126,7 +126,7 @@
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-combo.bi-combo-popup .bi-select-text-trigger,
.bi-combo:hover .bi-select-text-trigger {
.bi-combo.bi-combo-popup > .bi-select-text-trigger,
.bi-combo:hover > .bi-select-text-trigger {
border-color: #3685f2;
}

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

@ -32,13 +32,15 @@ textarea {
color: #606479 !important;
}
.bi-focus-shadow:focus-within,
.bi-focus-shadow:hover,
.bi-focus-shadow:focus {
border-color: #3685f2;
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-focus-shadow:hover {
border-color: #3685f2;
}
.base-invalid {
cursor: default !important;
}

4
src/css/widget/multiselect/multiselect.css
Unescape View File

@ -13,8 +13,8 @@
.bi-multi-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover .bi-multi-select-trigger {
.bi-combo.bi-combo-popup:focus > .bi-multi-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-multi-select-trigger {
border-color: #3685f2;
}

4
src/css/widget/singleselect/multiselect.css
Unescape View File

@ -13,3 +13,7 @@
.bi-single-select-combo.combo-show .trigger-down {
display: none;
}
.bi-combo.bi-combo-popup:focus > .bi-single-select-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-select-trigger {
border-color: #3685f2;
}

4
src/css/widget/singletreecombo/singletreecombo.css
Unescape View File

@ -1,4 +1,4 @@
.bi-combo.bi-combo-popup:focus .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover .bi-single-tree-trigger {
.bi-combo.bi-combo-popup:focus > .bi-single-tree-trigger,
.bi-combo.bi-combo-popup:hover > .bi-single-tree-trigger {
border-color: #3685f2;
}

2
src/less/base/combo/combo.less
Unescape View File

@ -3,7 +3,7 @@
&.bi-combo-popup {
display: block !important;
visibility: visible !important;
&:focus, &:hover {
&:focus, &:focus-within {
.box-shadow(0 0 5px 2px, @color-bi-blue-20);
}
}

2
src/less/base/combo/combo.searchtextvalue.less
Unescape View File

@ -29,7 +29,7 @@
.bi-combo {
&.bi-combo-popup, &:hover{
& .bi-search-text-value-trigger {
& > .bi-search-text-value-trigger {
border-color: @color-bi-border-highlight;
}
}

2
src/less/base/combo/combo.textvalue.less
Unescape View File

@ -12,7 +12,7 @@
.bi-combo {
&.bi-combo-popup, &:hover{
& .bi-select-text-trigger {
& > .bi-select-text-trigger {
border-color: @color-bi-border-highlight;
}
}

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

@ -42,10 +42,13 @@ textarea {
}
.bi-focus-shadow {
&:focus-within, &:hover, &:focus {
&:focus-within, &:focus {
border-color: @color-bi-border-highlight;
.box-shadow(0 0 5px 2px, @color-bi-blue-20);
}
&:hover {
border-color: @color-bi-border-highlight;
}
}
.base-invalid {

2
src/less/widget/multiselect/multiselect.combo.less
Unescape View File

@ -23,7 +23,7 @@
.bi-combo {
&.bi-combo-popup {
&:focus, &:hover {
& .bi-multi-select-trigger {
& > .bi-multi-select-trigger {
border-color: @color-bi-border-highlight;
}
}

10
src/less/widget/singleselect/multiselect.combo.less
Unescape View File

@ -18,4 +18,14 @@
display: none;
}
}
}
.bi-combo {
&.bi-combo-popup {
&:focus, &:hover {
& > .bi-single-select-trigger {
border-color: @color-bi-border-highlight;
}
}
}
}

2
src/less/widget/singletreecombo/singletreecombo.less
Unescape View File

@ -3,7 +3,7 @@
.bi-combo {
&.bi-combo-popup {
&:focus, &:hover {
& .bi-single-tree-trigger {
& > .bi-single-tree-trigger {
border-color: @color-bi-border-highlight;
}
}

5
src/widget/selecttree/selecttree.combo.js
Unescape View File

@ -10,7 +10,10 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
height: 30,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},

5
src/widget/singletree/singletree.combo.js
Unescape View File

@ -11,7 +11,10 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
height: 24,
text: "",
items: [],
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},

Write Preview
Loading…
Cancel
Save