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

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

* commit 'd2b9edb2566ac1fee03145c22caae50f51d61bab':
  update
  update
  update
  BI-29006 && BI-25571 && BI-28691 && BI-25557
es6
windy 6 years ago
parent
a9c218f734 d2b9edb256
commit
b2d83005e2
44 changed files with 542 additions and 241 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. 52
      dist/_fineui.min.js
  2. 25
      dist/base.css
  3. 3
      dist/base.js
  4. 28
      dist/bundle.css
  5. 100
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 68
      dist/bundle.min.js
  8. 82
      dist/case.js
  9. 3
      dist/core.css
  10. 28
      dist/fineui.css
  11. 100
      dist/fineui.js
  12. 2
      dist/fineui.min.css
  13. 52
      dist/fineui.min.js
  14. 2
      dist/utils.min.js
  15. 15
      dist/widget.js
  16. 3
      src/base/single/button/listitem/icontextitem.js
  17. 5
      src/case/button/item.multiselect.js
  18. 1
      src/case/button/item.singleselect.icontext.js
  19. 11
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  20. 4
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js
  21. 10
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  22. 3
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
  23. 5
      src/case/combo/textvaluecombo/combo.textvalue.js
  24. 23
      src/case/editor/editor.state.js
  25. 3
      src/case/list/list.select.js
  26. 5
      src/case/toolbar/toolbar.multiselect.js
  27. 9
      src/case/trigger/trigger.icon.text.js
  28. 3
      src/case/trigger/trigger.icon.text.select.js
  29. 4
      src/css/base/single/text.css
  30. 21
      src/css/base/tree/ztree.css
  31. 3
      src/css/core/normalize2.css
  32. 0
      src/css/widget/singletreecombo/singletreecombo.css
  33. 4
      src/less/base/combo/combo.less
  34. 12
      src/less/base/combo/combo.searchtextvalue.less
  35. 12
      src/less/base/combo/combo.textvalue.less
  36. 5
      src/less/base/single/text.less
  37. 35
      src/less/base/tree/ztree.less
  38. 4
      src/less/core/normalize2.less
  39. 10
      src/less/widget/multiselect/multiselect.combo.less
  40. 11
      src/less/widget/singletreecombo/singletreecombo.less
  41. 3
      src/widget/multiselect/multiselect.loader.js
  42. 4
      src/widget/multiselect/multiselect.loader.nobar.js
  43. 4
      src/widget/multiselect/search/multiselect.search.loader.js
  44. 4
      src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

52
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/base.css vendored
Unescape View File

@ -1569,6 +1569,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-break: break-word;
}
.bi-text:before {
content: '';
display: block;
}
.bi-bubble .bubble-text {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -1986,6 +1990,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
vertical-align: top;
display: inline-block;
}
.ztree li a:hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a:active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a.curSelectedNode_Edit {
padding-top: 0px;
background-color: #FFE6B0;
@ -2069,6 +2082,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.ztree li span.button.chk.radio_true_part_focus {
background-position: -42px -42px;
}
.ztree li span.button.chk.checkbox_true_full + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_full_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.radio_true_disable {
background-position: -42px -56px;
}

3
dist/base.js vendored
Unescape View File

@ -17446,6 +17446,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
iconWrapperWidth: null,
iconHeight: null,
iconWidth: null,
textHgap: 0,
@ -17472,7 +17473,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
});
this.icon = BI.createWidget({
type: "bi.icon_label",
width: o.height,
width: o.iconWrapperWidth || o.height,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight

28
dist/bundle.css vendored
Unescape View File

@ -249,6 +249,9 @@ a {
a:focus {
outline: 0;
}
div:focus {
outline: none;
}
input::-webkit-contacts-auto-fill-button {
visibility: hidden;
display: none !important;
@ -3418,6 +3421,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-break: break-word;
}
.bi-text:before {
content: '';
display: block;
}
.bi-bubble .bubble-text {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3835,6 +3842,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
vertical-align: top;
display: inline-block;
}
.ztree li a:hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a:active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a.curSelectedNode_Edit {
padding-top: 0px;
background-color: #FFE6B0;
@ -3918,6 +3934,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.ztree li span.button.chk.radio_true_part_focus {
background-position: -42px -42px;
}
.ztree li span.button.chk.checkbox_true_full + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_full_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.radio_true_disable {
background-position: -42px -56px;
}

100
dist/bundle.js vendored
Unescape View File

@ -53364,6 +53364,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
iconWrapperWidth: null,
iconHeight: null,
iconWidth: null,
textHgap: 0,
@ -53390,7 +53391,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
});
this.icon = BI.createWidget({
type: "bi.icon_label",
width: o.height,
width: o.iconWrapperWidth || o.height,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
@ -72843,7 +72844,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
height: 24,
logic: {
dynamic: false
}
},
iconWrapperWidth: 26
});
},
_init: function () {
@ -72878,7 +72880,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 26
width: o.iconWrapperWidth
}, this.text)
}))));
},
@ -72927,6 +72929,7 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
element: this,
cls: o.iconCls,
once: o.once,
iconWrapperWidth: o.iconWrapperWidth,
selected: o.selected,
height: o.height,
iconHeight: o.iconHeight,
@ -78608,7 +78611,10 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
height: 24,
iconHeight: null,
iconWidth: null,
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -78623,14 +78629,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
items: o.items,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue());
@ -78706,7 +78714,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
type: "bi.single_select_icon_text_item",
height: 24,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
}),
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
layouts: [{
@ -78736,6 +78745,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24,
iconWrapperWidth: o.iconWrapperWidth,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
});
@ -78779,6 +78789,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.combo = this;
},
attributes: {
tabIndex: 0
},
el: {
type: "bi.search_text_value_trigger",
ref: function () {
@ -78790,6 +78803,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
title: o.title,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {
@ -78800,14 +78814,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}]
},
popup: {
el:{
el: {
type: "bi.text_value_combo_popup",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
value: o.value,
items: o.items,
ref: function () {
self.popup = this;
self.trigger.getSearcher().setAdapter(self.popup);
// self.trigger.getSearcher().setAdapter(self.popup);
},
listeners: [{
eventName: BI.TextValueComboPopup.EVENT_CHANGE,
@ -78823,7 +78837,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
// self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
@ -79000,7 +79014,8 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
},
text: this._digest(o.value, o.items),
value: o.value,
height: o.height
height: o.height,
tipText: ""
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -79367,7 +79382,10 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -80724,6 +80742,16 @@ BI.StateEditor = BI.inherit(BI.Widget, {
self._showInput();
self.editor.focus();
self.editor.setValue("");
},
title: BI.isNotNull(o.tipText) ? o.tipText : function () {
var title = "";
if (BI.isString(self.stateValue)) {
title = self.stateValue;
}
if (BI.isArray(self.stateValue) && self.stateValue.length === 1) {
title = self.stateValue[0];
}
return title;
}
});
this.text.on(BI.TextButton.EVENT_CHANGE, function () {
@ -80883,32 +80911,23 @@ BI.StateEditor = BI.inherit(BI.Widget, {
setState: function (v) {
var o = this.options;
BI.StateEditor.superclass.setValue.apply(this, arguments);
this.stateValue = v;
if (BI.isNumber(v)) {
if (v === BI.Selection.All) {
this.text.setText(BI.i18nText("BI-Select_All"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else if (v === BI.Selection.Multi) {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(o.text);
this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text");
}
return;
}
if (BI.isString(v)) {
// if (BI.isEmpty(v)) {
// this.text.setText(o.text);
// this.text.setTitle("");
// this.text.element.addClass("state-editor-infinite-text");
// } else {
this.text.setText(v);
this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text");
// }
return;
}
if (BI.isArray(v)) {
@ -80917,11 +80936,9 @@ BI.StateEditor = BI.inherit(BI.Widget, {
this.text.element.addClass("state-editor-infinite-text");
} else if (v.length === 1) {
this.text.setText(v[0]);
this.text.setTitle(v[0]);
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
}
}
@ -81696,7 +81713,8 @@ BI.SelectList = BI.inherit(BI.Widget, {
hasNext: BI.emptyFn,
onLoaded: BI.emptyFn,
toolbar: {
type: "bi.multi_select_bar"
type: "bi.multi_select_bar",
iconWrapperWidth: 36
},
el: {
type: "bi.list_pane"
@ -86538,7 +86556,8 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
isHalfCheckedBySelectedValue: function (selectedValues) {
return selectedValues.length > 0;
},
halfSelected: false
halfSelected: false,
iconWrapperWidth: 26
});
},
_init: function () {
@ -86591,7 +86610,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 26,
width: o.iconWrapperWidth,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]
@ -87816,8 +87835,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
cls: "select-text-label",
textAlign: "left",
height: o.height,
text: o.text,
hgap: c.hgap
text: o.text
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
@ -87842,7 +87860,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth,
disableSelected: true
},
width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
},
{
el: this.text
@ -87868,8 +87886,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.wrapper.resize();
}
}else{
if(iconItem.width !== (o.triggerWidth || o.height)) {
iconItem.width = (o.triggerWidth || o.height);
if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
iconItem.width = (o.iconWrapperWidth || o.height);
this.wrapper.resize();
}
}
@ -87906,7 +87924,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
iconCls: obj.iconCls,
height: o.height,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
},
@ -98822,7 +98841,8 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},
@ -98996,8 +99016,10 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.multi_select_item",
cls: "bi-list-item-active",
logic: this.options.logic,
height: 24
height: 24,
iconWrapperWidth: 36
});
},
@ -99592,7 +99614,9 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
dynamic: false
},
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
cls: "bi-list-item-active",
iconWrapperWidth: 36
});
},
@ -105046,8 +105070,10 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.multi_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

68
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

82
dist/case.js vendored
Unescape View File

@ -164,7 +164,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
height: 24,
logic: {
dynamic: false
}
},
iconWrapperWidth: 26
});
},
_init: function () {
@ -199,7 +200,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 26
width: o.iconWrapperWidth
}, this.text)
}))));
},
@ -248,6 +249,7 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
element: this,
cls: o.iconCls,
once: o.once,
iconWrapperWidth: o.iconWrapperWidth,
selected: o.selected,
height: o.height,
iconHeight: o.iconHeight,
@ -5929,7 +5931,10 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
height: 24,
iconHeight: null,
iconWidth: null,
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -5944,14 +5949,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
items: o.items,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue());
@ -6027,7 +6034,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
type: "bi.single_select_icon_text_item",
height: 24,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
}),
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
layouts: [{
@ -6057,6 +6065,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24,
iconWrapperWidth: o.iconWrapperWidth,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
});
@ -6100,6 +6109,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.combo = this;
},
attributes: {
tabIndex: 0
},
el: {
type: "bi.search_text_value_trigger",
ref: function () {
@ -6111,6 +6123,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
title: o.title,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {
@ -6121,14 +6134,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}]
},
popup: {
el:{
el: {
type: "bi.text_value_combo_popup",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
value: o.value,
items: o.items,
ref: function () {
self.popup = this;
self.trigger.getSearcher().setAdapter(self.popup);
// self.trigger.getSearcher().setAdapter(self.popup);
},
listeners: [{
eventName: BI.TextValueComboPopup.EVENT_CHANGE,
@ -6144,7 +6157,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
// self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
@ -6321,7 +6334,8 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
},
text: this._digest(o.value, o.items),
value: o.value,
height: o.height
height: o.height,
tipText: ""
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -6688,7 +6702,10 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -8045,6 +8062,16 @@ BI.StateEditor = BI.inherit(BI.Widget, {
self._showInput();
self.editor.focus();
self.editor.setValue("");
},
title: BI.isNotNull(o.tipText) ? o.tipText : function () {
var title = "";
if (BI.isString(self.stateValue)) {
title = self.stateValue;
}
if (BI.isArray(self.stateValue) && self.stateValue.length === 1) {
title = self.stateValue[0];
}
return title;
}
});
this.text.on(BI.TextButton.EVENT_CHANGE, function () {
@ -8204,32 +8231,23 @@ BI.StateEditor = BI.inherit(BI.Widget, {
setState: function (v) {
var o = this.options;
BI.StateEditor.superclass.setValue.apply(this, arguments);
this.stateValue = v;
if (BI.isNumber(v)) {
if (v === BI.Selection.All) {
this.text.setText(BI.i18nText("BI-Select_All"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else if (v === BI.Selection.Multi) {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(o.text);
this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text");
}
return;
}
if (BI.isString(v)) {
// if (BI.isEmpty(v)) {
// this.text.setText(o.text);
// this.text.setTitle("");
// this.text.element.addClass("state-editor-infinite-text");
// } else {
this.text.setText(v);
this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text");
// }
return;
}
if (BI.isArray(v)) {
@ -8238,11 +8256,9 @@ BI.StateEditor = BI.inherit(BI.Widget, {
this.text.element.addClass("state-editor-infinite-text");
} else if (v.length === 1) {
this.text.setText(v[0]);
this.text.setTitle(v[0]);
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
}
}
@ -9017,7 +9033,8 @@ BI.SelectList = BI.inherit(BI.Widget, {
hasNext: BI.emptyFn,
onLoaded: BI.emptyFn,
toolbar: {
type: "bi.multi_select_bar"
type: "bi.multi_select_bar",
iconWrapperWidth: 36
},
el: {
type: "bi.list_pane"
@ -13859,7 +13876,8 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
isHalfCheckedBySelectedValue: function (selectedValues) {
return selectedValues.length > 0;
},
halfSelected: false
halfSelected: false,
iconWrapperWidth: 26
});
},
_init: function () {
@ -13912,7 +13930,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 26,
width: o.iconWrapperWidth,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]
@ -15137,8 +15155,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
cls: "select-text-label",
textAlign: "left",
height: o.height,
text: o.text,
hgap: c.hgap
text: o.text
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
@ -15163,7 +15180,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth,
disableSelected: true
},
width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
},
{
el: this.text
@ -15189,8 +15206,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.wrapper.resize();
}
}else{
if(iconItem.width !== (o.triggerWidth || o.height)) {
iconItem.width = (o.triggerWidth || o.height);
if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
iconItem.width = (o.iconWrapperWidth || o.height);
this.wrapper.resize();
}
}
@ -15227,7 +15244,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
iconCls: obj.iconCls,
height: o.height,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
},

3
dist/core.css vendored
Unescape View File

@ -249,6 +249,9 @@ a {
a:focus {
outline: 0;
}
div:focus {
outline: none;
}
input::-webkit-contacts-auto-fill-button {
visibility: hidden;
display: none !important;

28
dist/fineui.css vendored
Unescape View File

@ -249,6 +249,9 @@ a {
a:focus {
outline: 0;
}
div:focus {
outline: none;
}
input::-webkit-contacts-auto-fill-button {
visibility: hidden;
display: none !important;
@ -3418,6 +3421,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-break: break-word;
}
.bi-text:before {
content: '';
display: block;
}
.bi-bubble .bubble-text {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3835,6 +3842,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
vertical-align: top;
display: inline-block;
}
.ztree li a:hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a:active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a.curSelectedNode_Edit {
padding-top: 0px;
background-color: #FFE6B0;
@ -3918,6 +3934,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.ztree li span.button.chk.radio_true_part_focus {
background-position: -42px -42px;
}
.ztree li span.button.chk.checkbox_true_full + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_full_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.radio_true_disable {
background-position: -42px -56px;
}

100
dist/fineui.js vendored
Unescape View File

@ -53585,6 +53585,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
iconWrapperWidth: null,
iconHeight: null,
iconWidth: null,
textHgap: 0,
@ -53611,7 +53612,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
});
this.icon = BI.createWidget({
type: "bi.icon_label",
width: o.height,
width: o.iconWrapperWidth || o.height,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
@ -73064,7 +73065,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
height: 24,
logic: {
dynamic: false
}
},
iconWrapperWidth: 26
});
},
_init: function () {
@ -73099,7 +73101,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 26
width: o.iconWrapperWidth
}, this.text)
}))));
},
@ -73148,6 +73150,7 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
element: this,
cls: o.iconCls,
once: o.once,
iconWrapperWidth: o.iconWrapperWidth,
selected: o.selected,
height: o.height,
iconHeight: o.iconHeight,
@ -78829,7 +78832,10 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
height: 24,
iconHeight: null,
iconWidth: null,
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -78844,14 +78850,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
items: o.items,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue());
@ -78927,7 +78935,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
type: "bi.single_select_icon_text_item",
height: 24,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
}),
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
layouts: [{
@ -78957,6 +78966,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24,
iconWrapperWidth: o.iconWrapperWidth,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
});
@ -79000,6 +79010,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.combo = this;
},
attributes: {
tabIndex: 0
},
el: {
type: "bi.search_text_value_trigger",
ref: function () {
@ -79011,6 +79024,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
title: o.title,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {
@ -79021,14 +79035,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}]
},
popup: {
el:{
el: {
type: "bi.text_value_combo_popup",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
value: o.value,
items: o.items,
ref: function () {
self.popup = this;
self.trigger.getSearcher().setAdapter(self.popup);
// self.trigger.getSearcher().setAdapter(self.popup);
},
listeners: [{
eventName: BI.TextValueComboPopup.EVENT_CHANGE,
@ -79044,7 +79058,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
// self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {
@ -79221,7 +79235,8 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
},
text: this._digest(o.value, o.items),
value: o.value,
height: o.height
height: o.height,
tipText: ""
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -79588,7 +79603,10 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -80945,6 +80963,16 @@ BI.StateEditor = BI.inherit(BI.Widget, {
self._showInput();
self.editor.focus();
self.editor.setValue("");
},
title: BI.isNotNull(o.tipText) ? o.tipText : function () {
var title = "";
if (BI.isString(self.stateValue)) {
title = self.stateValue;
}
if (BI.isArray(self.stateValue) && self.stateValue.length === 1) {
title = self.stateValue[0];
}
return title;
}
});
this.text.on(BI.TextButton.EVENT_CHANGE, function () {
@ -81104,32 +81132,23 @@ BI.StateEditor = BI.inherit(BI.Widget, {
setState: function (v) {
var o = this.options;
BI.StateEditor.superclass.setValue.apply(this, arguments);
this.stateValue = v;
if (BI.isNumber(v)) {
if (v === BI.Selection.All) {
this.text.setText(BI.i18nText("BI-Select_All"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else if (v === BI.Selection.Multi) {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(o.text);
this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text");
}
return;
}
if (BI.isString(v)) {
// if (BI.isEmpty(v)) {
// this.text.setText(o.text);
// this.text.setTitle("");
// this.text.element.addClass("state-editor-infinite-text");
// } else {
this.text.setText(v);
this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text");
// }
return;
}
if (BI.isArray(v)) {
@ -81138,11 +81157,9 @@ BI.StateEditor = BI.inherit(BI.Widget, {
this.text.element.addClass("state-editor-infinite-text");
} else if (v.length === 1) {
this.text.setText(v[0]);
this.text.setTitle(v[0]);
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
}
}
@ -81917,7 +81934,8 @@ BI.SelectList = BI.inherit(BI.Widget, {
hasNext: BI.emptyFn,
onLoaded: BI.emptyFn,
toolbar: {
type: "bi.multi_select_bar"
type: "bi.multi_select_bar",
iconWrapperWidth: 36
},
el: {
type: "bi.list_pane"
@ -86759,7 +86777,8 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
isHalfCheckedBySelectedValue: function (selectedValues) {
return selectedValues.length > 0;
},
halfSelected: false
halfSelected: false,
iconWrapperWidth: 26
});
},
_init: function () {
@ -86812,7 +86831,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 26,
width: o.iconWrapperWidth,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]
@ -88037,8 +88056,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
cls: "select-text-label",
textAlign: "left",
height: o.height,
text: o.text,
hgap: c.hgap
text: o.text
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
@ -88063,7 +88081,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth,
disableSelected: true
},
width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
},
{
el: this.text
@ -88089,8 +88107,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.wrapper.resize();
}
}else{
if(iconItem.width !== (o.triggerWidth || o.height)) {
iconItem.width = (o.triggerWidth || o.height);
if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
iconItem.width = (o.iconWrapperWidth || o.height);
this.wrapper.resize();
}
}
@ -88127,7 +88145,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
iconCls: obj.iconCls,
height: o.height,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
},
@ -99043,7 +99062,8 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},
@ -99217,8 +99237,10 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.multi_select_item",
cls: "bi-list-item-active",
logic: this.options.logic,
height: 24
height: 24,
iconWrapperWidth: 36
});
},
@ -99813,7 +99835,9 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
dynamic: false
},
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
cls: "bi-list-item-active",
iconWrapperWidth: 36
});
},
@ -105267,8 +105291,10 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.multi_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},

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

15
dist/widget.js vendored
Unescape View File

@ -10640,7 +10640,8 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},
@ -10814,8 +10815,10 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.multi_select_item",
cls: "bi-list-item-active",
logic: this.options.logic,
height: 24
height: 24,
iconWrapperWidth: 36
});
},
@ -11410,7 +11413,9 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
dynamic: false
},
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
cls: "bi-list-item-active",
iconWrapperWidth: 36
});
},
@ -16864,8 +16869,10 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.multi_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},

3
src/base/single/button/listitem/icontextitem.js
Unescape View File

@ -15,6 +15,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
iconWrapperWidth: null,
iconHeight: null,
iconWidth: null,
textHgap: 0,
@ -41,7 +42,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
});
this.icon = BI.createWidget({
type: "bi.icon_label",
width: o.height,
width: o.iconWrapperWidth || o.height,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight

5
src/case/button/item.multiselect.js
Unescape View File

@ -10,7 +10,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
height: 24,
logic: {
dynamic: false
}
},
iconWrapperWidth: 26
});
},
_init: function () {
@ -45,7 +46,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 26
width: o.iconWrapperWidth
}, this.text)
}))));
},

1
src/case/button/item.singleselect.icontext.js
Unescape View File

@ -20,6 +20,7 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
element: this,
cls: o.iconCls,
once: o.once,
iconWrapperWidth: o.iconWrapperWidth,
selected: o.selected,
height: o.height,
iconHeight: o.iconHeight,

11
src/case/combo/icontextvaluecombo/combo.icontextvalue.js
Unescape View File

@ -9,7 +9,10 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
height: 24,
iconHeight: null,
iconWidth: null,
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},
@ -24,14 +27,16 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
items: o.items,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
this.popup.on(BI.IconTextValueComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue());

4
src/case/combo/icontextvaluecombo/popup.icontextvalue.js
Unescape View File

@ -17,7 +17,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
type: "bi.single_select_icon_text_item",
height: 24,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
}),
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
layouts: [{
@ -47,6 +48,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24,
iconWrapperWidth: o.iconWrapperWidth,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
});

10
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -25,6 +25,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.combo = this;
},
attributes: {
tabIndex: 0
},
el: {
type: "bi.search_text_value_trigger",
ref: function () {
@ -36,6 +39,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
title: o.title,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {
@ -46,14 +50,14 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}]
},
popup: {
el:{
el: {
type: "bi.text_value_combo_popup",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
value: o.value,
items: o.items,
ref: function () {
self.popup = this;
self.trigger.getSearcher().setAdapter(self.popup);
// self.trigger.getSearcher().setAdapter(self.popup);
},
listeners: [{
eventName: BI.TextValueComboPopup.EVENT_CHANGE,
@ -69,7 +73,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function () {
self.trigger.stopEditing();
// self.trigger.stopEditing();
self.element.removeClass("combo-show");
}
}, {

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

@ -27,7 +27,8 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
},
text: this._digest(o.value, o.items),
value: o.value,
height: o.height
height: o.height,
tipText: ""
},
popup: {
type: "bi.search_text_value_combo_popup",

5
src/case/combo/textvaluecombo/combo.textvalue.js
Unescape View File

@ -11,7 +11,10 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: ""
value: "",
attributes: {
tabIndex: 0
}
});
},

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

@ -55,6 +55,16 @@ BI.StateEditor = BI.inherit(BI.Widget, {
self._showInput();
self.editor.focus();
self.editor.setValue("");
},
title: BI.isNotNull(o.tipText) ? o.tipText : function () {
var title = "";
if (BI.isString(self.stateValue)) {
title = self.stateValue;
}
if (BI.isArray(self.stateValue) && self.stateValue.length === 1) {
title = self.stateValue[0];
}
return title;
}
});
this.text.on(BI.TextButton.EVENT_CHANGE, function () {
@ -214,32 +224,23 @@ BI.StateEditor = BI.inherit(BI.Widget, {
setState: function (v) {
var o = this.options;
BI.StateEditor.superclass.setValue.apply(this, arguments);
this.stateValue = v;
if (BI.isNumber(v)) {
if (v === BI.Selection.All) {
this.text.setText(BI.i18nText("BI-Select_All"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else if (v === BI.Selection.Multi) {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(o.text);
this.text.setTitle("");
this.text.element.addClass("state-editor-infinite-text");
}
return;
}
if (BI.isString(v)) {
// if (BI.isEmpty(v)) {
// this.text.setText(o.text);
// this.text.setTitle("");
// this.text.element.addClass("state-editor-infinite-text");
// } else {
this.text.setText(v);
this.text.setTitle(v);
this.text.element.removeClass("state-editor-infinite-text");
// }
return;
}
if (BI.isArray(v)) {
@ -248,11 +249,9 @@ BI.StateEditor = BI.inherit(BI.Widget, {
this.text.element.addClass("state-editor-infinite-text");
} else if (v.length === 1) {
this.text.setText(v[0]);
this.text.setTitle(v[0]);
this.text.element.removeClass("state-editor-infinite-text");
} else {
this.text.setText(BI.i18nText("BI-Select_Part"));
this.text.setTitle("");
this.text.element.removeClass("state-editor-infinite-text");
}
}

3
src/case/list/list.select.js
Unescape View File

@ -19,7 +19,8 @@ BI.SelectList = BI.inherit(BI.Widget, {
hasNext: BI.emptyFn,
onLoaded: BI.emptyFn,
toolbar: {
type: "bi.multi_select_bar"
type: "bi.multi_select_bar",
iconWrapperWidth: 36
},
el: {
type: "bi.list_pane"

5
src/case/toolbar/toolbar.multiselect.js
Unescape View File

@ -17,7 +17,8 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
isHalfCheckedBySelectedValue: function (selectedValues) {
return selectedValues.length > 0;
},
halfSelected: false
halfSelected: false,
iconWrapperWidth: 26
});
},
_init: function () {
@ -70,7 +71,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 26,
width: o.iconWrapperWidth,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]

9
src/case/trigger/trigger.icon.text.js
Unescape View File

@ -28,8 +28,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
cls: "select-text-label",
textAlign: "left",
height: o.height,
text: o.text,
hgap: c.hgap
text: o.text
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
@ -54,7 +53,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth,
disableSelected: true
},
width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
},
{
el: this.text
@ -80,8 +79,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.wrapper.resize();
}
}else{
if(iconItem.width !== (o.triggerWidth || o.height)) {
iconItem.width = (o.triggerWidth || o.height);
if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
iconItem.width = (o.iconWrapperWidth || o.height);
this.wrapper.resize();
}
}

3
src/case/trigger/trigger.icon.text.select.js
Unescape View File

@ -25,7 +25,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
iconCls: obj.iconCls,
height: o.height,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
});
},

4
src/css/base/single/text.css
Unescape View File

@ -13,3 +13,7 @@
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-break: break-word;
}
.bi-text:before {
content: '';
display: block;
}

21
src/css/base/tree/ztree.css
Unescape View File

@ -29,6 +29,15 @@
vertical-align: top;
display: inline-block;
}
.ztree li a:hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a:active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.ztree li a.curSelectedNode_Edit {
padding-top: 0px;
background-color: #FFE6B0;
@ -112,6 +121,18 @@
.ztree li span.button.chk.radio_true_part_focus {
background-position: -42px -42px;
}
.ztree li span.button.chk.checkbox_true_full + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_full_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part + a {
color: #3685f2;
}
.ztree li span.button.chk.checkbox_true_part_focus + a {
color: #3685f2;
}
.ztree li span.button.chk.radio_true_disable {
background-position: -42px -56px;
}

3
src/css/core/normalize2.css
Unescape View File

@ -19,6 +19,9 @@ a {
a:focus {
outline: 0;
}
div:focus {
outline: none;
}
input::-webkit-contacts-auto-fill-button {
visibility: hidden;
display: none !important;

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

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

@ -1,6 +1,10 @@
@import "../../index";
.bi-combo {
&.bi-combo-popup {
display: block !important;
visibility: visible !important;
//&:focus {
// .box-shadow(0 0 5px 2px, @color-bi-blue-20);
//}
}
}

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

@ -25,4 +25,14 @@
display: none;
}
}
}
}
//.bi-combo {
// &.bi-combo-popup {
// &:focus {
// & .bi-search-text-value-trigger {
// border-color: @color-bi-border-highlight;
// }
// }
// }
//}

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

@ -8,4 +8,14 @@
}
}
}
}
}
//.bi-combo {
// &.bi-combo-popup {
// &:focus {
// & .bi-select-text-trigger {
// border-color: @color-bi-border-highlight;
// }
// }
// }
//}

5
src/less/base/single/text.less
Unescape View File

@ -5,4 +5,9 @@
.box-sizing(border-box);
// BI-9141 加的，但是去掉后在firefox下没有问题，先去掉以适配ie9
word-break: break-word;
// safari下text-overflow:ellipsis且显示不下会有title
&:before {
content: '';
display: block;
}
}

35
src/less/base/tree/ztree.less
Unescape View File

@ -33,7 +33,14 @@
background-color: transparent;
text-decoration: none;
vertical-align: top;
display: inline-block
display: inline-block;
&:hover {
.background-color(@color-bi-background-highlight, 6%);
}
&:active {
color: @color-bi-text-highlight;
.background-color(@color-bi-background-highlight, 6%);
}
}
.ztree li a.curSelectedNode {
@ -134,7 +141,7 @@
}
.ztree li span.button.chk.radio_true_full_focus {
background-position: -42px -14px
background-position: -42px -14px;
}
.ztree li span.button.chk.radio_true_part {
@ -145,6 +152,30 @@
background-position: -42px -42px
}
.ztree li span.button.chk.checkbox_true_full {
& + a {
color: @color-bi-text-highlight;
}
}
.ztree li span.button.chk.checkbox_true_full_focus {
& + a {
color: @color-bi-text-highlight;
}
}
.ztree li span.button.chk.checkbox_true_part {
& + a {
color: @color-bi-text-highlight;
}
}
.ztree li span.button.chk.checkbox_true_part_focus {
& + a {
color: @color-bi-text-highlight;
}
}
.ztree li span.button.chk.radio_true_disable {
background-position: -42px -56px
}

4
src/less/core/normalize2.less
Unescape View File

@ -24,6 +24,10 @@ a:focus {
outline: 0;
}
div:focus {
outline: none;
}
input {
&::-webkit-contacts-auto-fill-button {
visibility: hidden;

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

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

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

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

3
src/widget/multiselect/multiselect.loader.js
Unescape View File

@ -118,7 +118,8 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},

4
src/widget/multiselect/multiselect.loader.nobar.js
Unescape View File

@ -114,8 +114,10 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.multi_select_item",
cls: "bi-list-item-active",
logic: this.options.logic,
height: 24
height: 24,
iconWrapperWidth: 36
});
},

4
src/widget/multiselect/search/multiselect.search.loader.js
Unescape View File

@ -87,7 +87,9 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
dynamic: false
},
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
cls: "bi-list-item-active",
iconWrapperWidth: 36
});
},

4
src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js
Unescape View File

@ -111,8 +111,10 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.multi_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: this.isAllSelected()
selected: this.isAllSelected(),
iconWrapperWidth: 36
});
},

Write Preview
Loading…
Cancel
Save