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

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

* commit '51572028cd0bd9dbee6b887c96f761fcb2013a6b':
  update
  BI-28696 && BI-19821
es6
windy 6 years ago
parent
ff547c8ad2 51572028cd
commit
56524d1657
37 changed files with 510 additions and 170 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. 2
      demo/js/case/editor/demo.sign_editor.js
  2. 52
      dist/_fineui.min.js
  3. 14
      dist/base.css
  4. 6
      dist/base.js
  5. 30
      dist/bundle.css
  6. 78
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 52
      dist/bundle.min.js
  9. 66
      dist/case.js
  10. 8
      dist/core.css
  11. 8
      dist/core_without_normalize.css
  12. 2
      dist/demo.js
  13. 30
      dist/fineui.css
  14. 78
      dist/fineui.js
  15. 2
      dist/fineui.min.css
  16. 52
      dist/fineui.min.js
  17. 2
      dist/utils.min.js
  18. 8
      dist/widget.css
  19. 6
      dist/widget.js
  20. 6
      src/base/single/button/listitem/icontexticonitem.js
  21. 53
      src/case/calendar/calendar.date.item.js
  22. 10
      src/case/calendar/calendar.js
  23. 2
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
  24. 2
      src/case/trigger/trigger.text.select.js
  25. 14
      src/css/base/combo/combo.css
  26. 8
      src/css/core/utils/common.css
  27. 4
      src/css/widget/multiselect/multiselect.css
  28. 4
      src/css/widget/singletreecombo/singletreecombo.css
  29. 6
      src/less/base/combo/combo.less
  30. 16
      src/less/base/combo/combo.searchtextvalue.less
  31. 16
      src/less/base/combo/combo.textvalue.less
  32. 7
      src/less/core/utils/common.less
  33. 14
      src/less/widget/multiselect/multiselect.combo.less
  34. 14
      src/less/widget/singletreecombo/singletreecombo.less
  35. 2
      src/widget/date/calendar/popup.calendar.date.js
  36. 2
      src/widget/editor/editor.search.js
  37. 2
      src/widget/numbereditor/number.editor.js

2
demo/js/case/editor/demo.sign_editor.js
Unescape View File

@ -8,7 +8,7 @@ Demo.SignEditor = BI.inherit(BI.Widget, {
render: function () {
var editor = BI.createWidget({
type: "bi.sign_editor",
cls: "bi-border",
cls: "bi-border bi-focus-shadow",
validationChecker: function (v) {
return v != "abc";
},

52
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
dist/base.css vendored
Unescape View File

@ -422,6 +422,12 @@
display: block !important;
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
@ -441,6 +447,10 @@
.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 {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
@ -449,6 +459,10 @@
.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 {
border-color: #3685f2;
}
/*************BI.SearchEditor******************/
.bi-search-editor {
-webkit-border-radius: 2px;

6
dist/base.js vendored
Unescape View File

@ -17353,14 +17353,14 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
var icon1 = BI.createWidget({
type: "bi.icon_label",
cls: o.iconCls1,
width: o.height,
width: o.leftIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
});
var blank = BI.createWidget({
type: "bi.layout",
width: o.height,
width: o.height
});
BI.createWidget({
type: "bi.absolute",
@ -17369,7 +17369,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
el: {
type: "bi.icon_label",
cls: o.iconCls2,
width: o.height,
width: o.rightIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight

30
dist/bundle.css vendored
Unescape View File

@ -312,6 +312,14 @@ textarea {
.bi-theme-dark .base-disabled .b-font:before {
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;
}
.base-invalid {
cursor: default !important;
}
@ -2274,6 +2282,12 @@ textarea {
display: block !important;
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
@ -2293,6 +2307,10 @@ 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 {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
@ -2301,6 +2319,10 @@ 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 {
border-color: #3685f2;
}
/*************BI.SearchEditor******************/
.bi-search-editor {
-webkit-border-radius: 2px;
@ -4231,6 +4253,10 @@ 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 {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
@ -4545,6 +4571,10 @@ 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 {
border-color: #3685f2;
}
.bi-date-interval.time-error .bi-input {
color: #ff4949;
}

78
dist/bundle.js vendored
Unescape View File

@ -53275,14 +53275,14 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
var icon1 = BI.createWidget({
type: "bi.icon_label",
cls: o.iconCls1,
width: o.height,
width: o.leftIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
});
var blank = BI.createWidget({
type: "bi.layout",
width: o.height,
width: o.height
});
BI.createWidget({
type: "bi.absolute",
@ -53291,7 +53291,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
el: {
type: "bi.icon_label",
cls: o.iconCls2,
width: o.height,
width: o.rightIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
@ -74283,6 +74283,58 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
});
BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);/**
* 专门为calendar的视觉加的button，作为私有button,不能配置任何属性，也不要用这个玩意
*/
BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.absolute",
items: [{
el: {
type: "bi.text_item",
cls: "bi-list-item-select",
textAlign: "center",
whiteSpace: "normal",
text: o.text,
value: o.value,
ref: function () {
self.text = this;
}
},
left: o.lgap,
right: o.rgap,
top: 0,
bottom: 0
}]
};
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
setSelected: function (b) {
BI.CalendarDateItem.superclass.setSelected.apply(this, arguments);
this.text.setSelected(b);
},
getValue: function () {
return this.text.getValue();
}
});
BI.shortcut("bi.calendar_date_item", BI.CalendarDateItem);/**
* Created by GUY on 2015/8/28.
* @class BI.Calendar
* @extends BI.Widget
@ -74371,7 +74423,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items: items,
layouts: [{
type: "bi.center",
hgap: 10,
lgap: 10,
vgap: 10
}]
});
@ -74388,15 +74440,16 @@ BI.Calendar = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
type: "bi.calendar_date_item",
textAlign: "center",
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 10,
rgap: 0
// selected: td.currentDay
});
});
@ -74410,7 +74463,6 @@ BI.Calendar = BI.inherit(BI.Widget, {
rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: 24,
hgap: 10,
vgap: 10
}))]
});
@ -78995,7 +79047,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
props: {
baseCls: "bi-search-text-value-trigger bi-border",
baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
height: 24
},
@ -88040,7 +88092,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-text-trigger bi-border",
baseCls: "bi-select-text-trigger bi-border bi-focus-shadow",
height: 24
});
},
@ -89122,7 +89174,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.calendar,
left: 10,
left: 0,
right: 10
}, {
el: {
@ -93352,7 +93404,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
baseCls: "bi-search-editor bi-border bi-focus-shadow",
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
@ -102439,7 +102491,7 @@ BI.shortcut("bi.multi_tree_searcher", BI.MultiTreeSearcher);/**
BI.NumberEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-number-editor bi-border",
baseCls: "bi-number-editor bi-border bi-focus-shadow",
validationChecker: function () {
return true;
},

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

52
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

66
dist/case.js vendored
Unescape View File

@ -1599,6 +1599,58 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
});
BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);/**
* 专门为calendar的视觉加的button，作为私有button,不能配置任何属性，也不要用这个玩意
*/
BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.absolute",
items: [{
el: {
type: "bi.text_item",
cls: "bi-list-item-select",
textAlign: "center",
whiteSpace: "normal",
text: o.text,
value: o.value,
ref: function () {
self.text = this;
}
},
left: o.lgap,
right: o.rgap,
top: 0,
bottom: 0
}]
};
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
setSelected: function (b) {
BI.CalendarDateItem.superclass.setSelected.apply(this, arguments);
this.text.setSelected(b);
},
getValue: function () {
return this.text.getValue();
}
});
BI.shortcut("bi.calendar_date_item", BI.CalendarDateItem);/**
* Created by GUY on 2015/8/28.
* @class BI.Calendar
* @extends BI.Widget
@ -1687,7 +1739,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items: items,
layouts: [{
type: "bi.center",
hgap: 10,
lgap: 10,
vgap: 10
}]
});
@ -1704,15 +1756,16 @@ BI.Calendar = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
type: "bi.calendar_date_item",
textAlign: "center",
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 10,
rgap: 0
// selected: td.currentDay
});
});
@ -1726,7 +1779,6 @@ BI.Calendar = BI.inherit(BI.Widget, {
rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: 24,
hgap: 10,
vgap: 10
}))]
});
@ -6311,7 +6363,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
props: {
baseCls: "bi-search-text-value-trigger bi-border",
baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
height: 24
},
@ -15356,7 +15408,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-text-trigger bi-border",
baseCls: "bi-select-text-trigger bi-border bi-focus-shadow",
height: 24
});
},

8
dist/core.css vendored
Unescape View File

@ -312,6 +312,14 @@ textarea {
.bi-theme-dark .base-disabled .b-font:before {
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;
}
.base-invalid {
cursor: default !important;
}

8
dist/core_without_normalize.css vendored
Unescape View File

@ -31,6 +31,14 @@ textarea {
.bi-theme-dark .base-disabled .b-font:before {
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;
}
.base-invalid {
cursor: default !important;
}

2
dist/demo.js vendored
Unescape View File

@ -2696,7 +2696,7 @@ Demo.SignEditor = BI.inherit(BI.Widget, {
render: function () {
var editor = BI.createWidget({
type: "bi.sign_editor",
cls: "bi-border",
cls: "bi-border bi-focus-shadow",
validationChecker: function (v) {
return v != "abc";
},

30
dist/fineui.css vendored
Unescape View File

@ -312,6 +312,14 @@ textarea {
.bi-theme-dark .base-disabled .b-font:before {
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;
}
.base-invalid {
cursor: default !important;
}
@ -2274,6 +2282,12 @@ textarea {
display: block !important;
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
@ -2293,6 +2307,10 @@ 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 {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
@ -2301,6 +2319,10 @@ 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 {
border-color: #3685f2;
}
/*************BI.SearchEditor******************/
.bi-search-editor {
-webkit-border-radius: 2px;
@ -4231,6 +4253,10 @@ 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 {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
@ -4545,6 +4571,10 @@ 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 {
border-color: #3685f2;
}
.bi-date-interval.time-error .bi-input {
color: #ff4949;
}

78
dist/fineui.js vendored
Unescape View File

@ -53496,14 +53496,14 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
var icon1 = BI.createWidget({
type: "bi.icon_label",
cls: o.iconCls1,
width: o.height,
width: o.leftIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
});
var blank = BI.createWidget({
type: "bi.layout",
width: o.height,
width: o.height
});
BI.createWidget({
type: "bi.absolute",
@ -53512,7 +53512,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
el: {
type: "bi.icon_label",
cls: o.iconCls2,
width: o.height,
width: o.rightIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
@ -74504,6 +74504,58 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
});
BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);/**
* 专门为calendar的视觉加的button，作为私有button,不能配置任何属性，也不要用这个玩意
*/
BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.absolute",
items: [{
el: {
type: "bi.text_item",
cls: "bi-list-item-select",
textAlign: "center",
whiteSpace: "normal",
text: o.text,
value: o.value,
ref: function () {
self.text = this;
}
},
left: o.lgap,
right: o.rgap,
top: 0,
bottom: 0
}]
};
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
setSelected: function (b) {
BI.CalendarDateItem.superclass.setSelected.apply(this, arguments);
this.text.setSelected(b);
},
getValue: function () {
return this.text.getValue();
}
});
BI.shortcut("bi.calendar_date_item", BI.CalendarDateItem);/**
* Created by GUY on 2015/8/28.
* @class BI.Calendar
* @extends BI.Widget
@ -74592,7 +74644,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items: items,
layouts: [{
type: "bi.center",
hgap: 10,
lgap: 10,
vgap: 10
}]
});
@ -74609,15 +74661,16 @@ BI.Calendar = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
type: "bi.calendar_date_item",
textAlign: "center",
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 10,
rgap: 0
// selected: td.currentDay
});
});
@ -74631,7 +74684,6 @@ BI.Calendar = BI.inherit(BI.Widget, {
rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: 24,
hgap: 10,
vgap: 10
}))]
});
@ -79216,7 +79268,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
props: {
baseCls: "bi-search-text-value-trigger bi-border",
baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
height: 24
},
@ -88261,7 +88313,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-text-trigger bi-border",
baseCls: "bi-select-text-trigger bi-border bi-focus-shadow",
height: 24
});
},
@ -89343,7 +89395,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.calendar,
left: 10,
left: 0,
right: 10
}, {
el: {
@ -93573,7 +93625,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
baseCls: "bi-search-editor bi-border bi-focus-shadow",
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
@ -102660,7 +102712,7 @@ BI.shortcut("bi.multi_tree_searcher", BI.MultiTreeSearcher);/**
BI.NumberEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-number-editor bi-border",
baseCls: "bi-number-editor bi-border bi-focus-shadow",
validationChecker: function () {
return true;
},

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

52
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/widget.css vendored
Unescape View File

@ -117,6 +117,10 @@
.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 {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
@ -431,6 +435,10 @@
-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 {
border-color: #3685f2;
}
.bi-date-interval.time-error .bi-input {
color: #ff4949;
}

6
dist/widget.js vendored
Unescape View File

@ -917,7 +917,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.calendar,
left: 10,
left: 0,
right: 10
}, {
el: {
@ -5147,7 +5147,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
baseCls: "bi-search-editor bi-border bi-focus-shadow",
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
@ -14234,7 +14234,7 @@ BI.shortcut("bi.multi_tree_searcher", BI.MultiTreeSearcher);/**
BI.NumberEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-number-editor bi-border",
baseCls: "bi-number-editor bi-border bi-focus-shadow",
validationChecker: function () {
return true;
},

6
src/base/single/button/listitem/icontexticonitem.js
Unescape View File

@ -44,14 +44,14 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
var icon1 = BI.createWidget({
type: "bi.icon_label",
cls: o.iconCls1,
width: o.height,
width: o.leftIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
});
var blank = BI.createWidget({
type: "bi.layout",
width: o.height,
width: o.height
});
BI.createWidget({
type: "bi.absolute",
@ -60,7 +60,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
el: {
type: "bi.icon_label",
cls: o.iconCls2,
width: o.height,
width: o.rightIconWrapperWidth,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight

53
src/case/calendar/calendar.date.item.js
Unescape View File

@ -0,0 +1,53 @@
/**
* 专门为calendar的视觉加的button，作为私有button,不能配置任何属性，也不要用这个玩意
*/
BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.absolute",
items: [{
el: {
type: "bi.text_item",
cls: "bi-list-item-select",
textAlign: "center",
whiteSpace: "normal",
text: o.text,
value: o.value,
ref: function () {
self.text = this;
}
},
left: o.lgap,
right: o.rgap,
top: 0,
bottom: 0
}]
};
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
setSelected: function (b) {
BI.CalendarDateItem.superclass.setSelected.apply(this, arguments);
this.text.setSelected(b);
},
getValue: function () {
return this.text.getValue();
}
});
BI.shortcut("bi.calendar_date_item", BI.CalendarDateItem);

10
src/case/calendar/calendar.js
Unescape View File

@ -87,7 +87,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items: items,
layouts: [{
type: "bi.center",
hgap: 10,
lgap: 10,
vgap: 10
}]
});
@ -104,15 +104,16 @@ BI.Calendar = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
type: "bi.calendar_date_item",
textAlign: "center",
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 10,
rgap: 0
// selected: td.currentDay
});
});
@ -126,7 +127,6 @@ BI.Calendar = BI.inherit(BI.Widget, {
rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: 24,
hgap: 10,
vgap: 10
}))]
});

2
src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
Unescape View File

@ -4,7 +4,7 @@
BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
props: {
baseCls: "bi-search-text-value-trigger bi-border",
baseCls: "bi-search-text-value-trigger bi-border bi-focus-shadow",
height: 24
},

2
src/case/trigger/trigger.text.select.js
Unescape View File

@ -9,7 +9,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-text-trigger bi-border",
baseCls: "bi-select-text-trigger bi-border bi-focus-shadow",
height: 24
});
},

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

@ -89,6 +89,12 @@
display: block !important;
visibility: visible !important;
}
.bi-combo.bi-combo-popup:focus,
.bi-combo.bi-combo-popup:hover {
-webkit-box-shadow: 0 0 5px 2px #d7e7fc;
-moz-box-shadow: 0 0 5px 2px #d7e7fc;
box-shadow: 0 0 5px 2px #d7e7fc;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
@ -108,6 +114,10 @@
.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 {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
@ -116,3 +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 {
border-color: #3685f2;
}

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

@ -31,6 +31,14 @@ textarea {
.bi-theme-dark .base-disabled .b-font:before {
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;
}
.base-invalid {
cursor: default !important;
}

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

@ -13,6 +13,10 @@
.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 {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;

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

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

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

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

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

@ -27,12 +27,10 @@
}
}
//.bi-combo {
// &.bi-combo-popup {
// &:focus {
// & .bi-search-text-value-trigger {
// border-color: @color-bi-border-highlight;
// }
// }
// }
//}
.bi-combo {
&.bi-combo-popup, &:hover{
& .bi-search-text-value-trigger {
border-color: @color-bi-border-highlight;
}
}
}

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

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

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

@ -41,6 +41,13 @@ textarea {
}
}
.bi-focus-shadow {
&:focus-within, &:hover, &:focus {
border-color: @color-bi-border-highlight;
.box-shadow(0 0 5px 2px, @color-bi-blue-20);
}
}
.base-invalid {
cursor: default !important;
}

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

@ -21,11 +21,11 @@
}
.bi-combo {
//&.bi-combo-popup {
// &:focus {
// & .bi-multi-select-trigger {
// border-color: @color-bi-border-highlight;
// }
// }
//}
&.bi-combo-popup {
&:focus, &:hover {
& .bi-multi-select-trigger {
border-color: @color-bi-border-highlight;
}
}
}
}

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

@ -1,11 +1,11 @@
@import "../../index";
.bi-combo {
//&.bi-combo-popup {
// &:focus {
// & .bi-single-tree-trigger {
// border-color: @color-bi-border-highlight;
// }
// }
//}
&.bi-combo-popup {
&:focus, &:hover {
& .bi-single-tree-trigger {
border-color: @color-bi-border-highlight;
}
}
}
}

2
src/widget/date/calendar/popup.calendar.date.js
Unescape View File

@ -86,7 +86,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.calendar,
left: 10,
left: 0,
right: 10
}, {
el: {

2
src/widget/editor/editor.search.js
Unescape View File

@ -5,7 +5,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
baseCls: "bi-search-editor bi-border bi-focus-shadow",
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),

2
src/widget/numbereditor/number.editor.js
Unescape View File

@ -5,7 +5,7 @@
BI.NumberEditor = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-number-editor bi-border",
baseCls: "bi-number-editor bi-border bi-focus-shadow",
validationChecker: function () {
return true;
},

Write Preview
Loading…
Cancel
Save