Browse Source

BI-28465 && BI-28333 && BI-28340

es6
windy 6 years ago
parent
commit
58e72b2955
  1. 49
      dist/_fineui.min.js
  2. 12
      dist/base.css
  3. 8
      dist/base.js
  4. 15
      dist/bundle.css
  5. 97
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 50
      dist/bundle.min.js
  8. 11
      dist/case.js
  9. 3
      dist/core.css
  10. 3
      dist/core_without_normalize.css
  11. 15
      dist/fineui.css
  12. 97
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 49
      dist/fineui.min.js
  15. 2
      dist/utils.min.js
  16. 78
      dist/widget.js
  17. 5
      src/base/layer/layer.popover.js
  18. 3
      src/base/single/button/listitem/icontextitem.js
  19. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  20. 1
      src/case/combo/textvaluecombo/combo.textvaluesmall.js
  21. 12
      src/css/base/single/button/button.css
  22. 3
      src/css/core/utils/common.css
  23. 10
      src/less/base/single/button/button.less
  24. 4
      src/less/core/utils/common.less
  25. 17
      src/widget/date/calendar/trigger.triangle.date.js
  26. 2
      src/widget/multiselect/multiselect.combo.js
  27. 4
      src/widget/multiselect/multiselect.insert.combo.js
  28. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  29. 3
      src/widget/multitree/multi.tree.combo.js
  30. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  31. 2
      src/widget/singleselect/singleselect.combo.js
  32. 2
      src/widget/singleselect/singleselect.insert.combo.js
  33. 20
      src/widget/yearmonth/trigger.yearmonth.js
  34. 20
      src/widget/yearquarter/trigger.yearquarter.js

49
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/base.css vendored

@ -1407,8 +1407,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:hover .bi-button-mask,
.bi-basic-button.button-success:hover .bi-button-mask,
.bi-basic-button.button-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask,
.bi-basic-button.button-ignore:hover .bi-button-mask {
.bi-basic-button.button-error:hover .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #ffffff;
@ -1416,12 +1415,17 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:active .bi-button-mask,
.bi-basic-button.button-success:active .bi-button-mask,
.bi-basic-button.button-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask,
.bi-basic-button.button-ignore:active .bi-button-mask {
.bi-basic-button.button-error:active .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #232E40;
}
.bi-basic-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-basic-button.button-ignore:active {
background-color: #eaf2fd;
}
.bi-basic-button .popup-content {
font-size: 14px;
}

8
dist/base.js vendored

@ -15424,8 +15424,11 @@ BI.Popover = BI.inherit(BI.Widget, {
el: {
type: "bi.absolute",
items: [{
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : {
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
extraCls: "bi-font-bold"
}) : {
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
title: o.header,
@ -17487,7 +17490,8 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text)
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text),
lgap: 5
}))));
},

15
dist/bundle.css vendored

@ -399,6 +399,9 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
@ -3253,8 +3256,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:hover .bi-button-mask,
.bi-basic-button.button-success:hover .bi-button-mask,
.bi-basic-button.button-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask,
.bi-basic-button.button-ignore:hover .bi-button-mask {
.bi-basic-button.button-error:hover .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #ffffff;
@ -3262,12 +3264,17 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:active .bi-button-mask,
.bi-basic-button.button-success:active .bi-button-mask,
.bi-basic-button.button-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask,
.bi-basic-button.button-ignore:active .bi-button-mask {
.bi-basic-button.button-error:active .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #232E40;
}
.bi-basic-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-basic-button.button-ignore:active {
background-color: #eaf2fd;
}
.bi-basic-button .popup-content {
font-size: 14px;
}

97
dist/bundle.js vendored

@ -51337,8 +51337,11 @@ BI.Popover = BI.inherit(BI.Widget, {
el: {
type: "bi.absolute",
items: [{
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : {
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
extraCls: "bi-font-bold"
}) : {
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
title: o.header,
@ -53400,7 +53403,8 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text)
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text),
lgap: 5
}))));
},
@ -76316,6 +76320,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 1,
isNeedAdjustWidth: false,
isNeedAdjustHeight: false,
@ -76691,6 +76696,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.color_chooser",
element: this,
container: o.container,
value: o.value,
popup: {
type: "bi.simple_color_chooser_popup"
@ -77886,6 +77892,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
element: this,
trigger: o.trigger,
toggle: o.toggle,
container: o.container,
direction: o.direction,
isDefaultInit: o.isDefaultInit,
destroyWhenHide: o.destroyWhenHide,
@ -78641,6 +78648,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.textIconCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {
@ -78770,6 +78778,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.combo",
container: o.container,
adjustLength: 2,
toggle: false,
ref: function () {
@ -78830,7 +78839,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
return self.triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
},
left: 0,
@ -79120,6 +79129,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.combo",
element: this,
adjustLength: 2,
container: o.container,
el: this.trigger,
popup: {
el: this.popup
@ -79477,6 +79487,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {
@ -83487,7 +83498,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
var self = this;
var found = false;
do {
if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
if (t.nodeName !== "svg" && t.className && t.className.indexOf && t.className.indexOf(prefix) != -1) {
return;
// return false;
}
@ -89113,23 +89124,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value,
height: c.height
});
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({
type: "bi.center_adapt",
type: "bi.vertical_adapt",
element: this,
items: [{
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [{
el: this.text,
rgap: 10
}, this.icon]
rgap: 5
}, {
type: "bi.icon_label",
width: 16
}]
});
},
@ -97355,6 +97359,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -97396,7 +97401,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -97656,6 +97661,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text,
// adapter: this.popup,
masker: {
container: "body",
offset: {
left: 0,
top: 0,
@ -97737,6 +97743,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
toggle: false,
el: this.trigger,
adjustLength: 1,
container: o.container,
popup: {
type: "bi.multi_select_popup_view",
ref: function () {
@ -97776,7 +97783,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
(self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -98119,6 +98127,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -98163,7 +98172,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -101609,6 +101618,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
container: "body",
offset: this.constants.offset
},
searcher: {
@ -101682,7 +101692,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
},
value: {value: o.value || {}},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -104284,6 +104294,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -104325,7 +104336,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -106641,7 +106652,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});
@ -106910,7 +106921,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});
@ -111405,9 +111416,23 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
return yearStr + monthStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.month;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.month;
}
},
setValue: function (v) {
@ -112341,9 +112366,23 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
return yearStr + quarterStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.quarter;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.quarter;
}
},
_getText: function (obj) {

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

50
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/case.js vendored

@ -3635,6 +3635,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 1,
isNeedAdjustWidth: false,
isNeedAdjustHeight: false,
@ -4010,6 +4011,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.color_chooser",
element: this,
container: o.container,
value: o.value,
popup: {
type: "bi.simple_color_chooser_popup"
@ -5205,6 +5207,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
element: this,
trigger: o.trigger,
toggle: o.toggle,
container: o.container,
direction: o.direction,
isDefaultInit: o.isDefaultInit,
destroyWhenHide: o.destroyWhenHide,
@ -5960,6 +5963,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.textIconCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {
@ -6089,6 +6093,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.combo",
container: o.container,
adjustLength: 2,
toggle: false,
ref: function () {
@ -6149,7 +6154,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
return self.triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
},
left: 0,
@ -6439,6 +6444,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.combo",
element: this,
adjustLength: 2,
container: o.container,
el: this.trigger,
popup: {
el: this.popup
@ -6796,6 +6802,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {
@ -10806,7 +10813,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
var self = this;
var found = false;
do {
if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
if (t.nodeName !== "svg" && t.className && t.className.indexOf && t.className.indexOf(prefix) != -1) {
return;
// return false;
}

3
dist/core.css vendored

@ -399,6 +399,9 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}

3
dist/core_without_normalize.css vendored

@ -121,6 +121,9 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}

15
dist/fineui.css vendored

@ -399,6 +399,9 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}
@ -3253,8 +3256,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:hover .bi-button-mask,
.bi-basic-button.button-success:hover .bi-button-mask,
.bi-basic-button.button-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask,
.bi-basic-button.button-ignore:hover .bi-button-mask {
.bi-basic-button.button-error:hover .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #ffffff;
@ -3262,12 +3264,17 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:active .bi-button-mask,
.bi-basic-button.button-success:active .bi-button-mask,
.bi-basic-button.button-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask,
.bi-basic-button.button-ignore:active .bi-button-mask {
.bi-basic-button.button-error:active .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #232E40;
}
.bi-basic-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-basic-button.button-ignore:active {
background-color: #eaf2fd;
}
.bi-basic-button .popup-content {
font-size: 14px;
}

97
dist/fineui.js vendored

@ -51586,8 +51586,11 @@ BI.Popover = BI.inherit(BI.Widget, {
el: {
type: "bi.absolute",
items: [{
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : {
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
extraCls: "bi-font-bold"
}) : {
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
title: o.header,
@ -53649,7 +53652,8 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text)
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text),
lgap: 5
}))));
},
@ -76565,6 +76569,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 1,
isNeedAdjustWidth: false,
isNeedAdjustHeight: false,
@ -76940,6 +76945,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.color_chooser",
element: this,
container: o.container,
value: o.value,
popup: {
type: "bi.simple_color_chooser_popup"
@ -78135,6 +78141,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
element: this,
trigger: o.trigger,
toggle: o.toggle,
container: o.container,
direction: o.direction,
isDefaultInit: o.isDefaultInit,
destroyWhenHide: o.destroyWhenHide,
@ -78890,6 +78897,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.textIconCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {
@ -79019,6 +79027,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.combo",
container: o.container,
adjustLength: 2,
toggle: false,
ref: function () {
@ -79079,7 +79088,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
return self.triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
},
left: 0,
@ -79369,6 +79378,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.combo",
element: this,
adjustLength: 2,
container: o.container,
el: this.trigger,
popup: {
el: this.popup
@ -79726,6 +79736,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {
@ -83736,7 +83747,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
var self = this;
var found = false;
do {
if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
if (t.nodeName !== "svg" && t.className && t.className.indexOf && t.className.indexOf(prefix) != -1) {
return;
// return false;
}
@ -89362,23 +89373,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value,
height: c.height
});
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({
type: "bi.center_adapt",
type: "bi.vertical_adapt",
element: this,
items: [{
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [{
el: this.text,
rgap: 10
}, this.icon]
rgap: 5
}, {
type: "bi.icon_label",
width: 16
}]
});
},
@ -97604,6 +97608,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -97645,7 +97650,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -97905,6 +97910,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text,
// adapter: this.popup,
masker: {
container: "body",
offset: {
left: 0,
top: 0,
@ -97986,6 +97992,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
toggle: false,
el: this.trigger,
adjustLength: 1,
container: o.container,
popup: {
type: "bi.multi_select_popup_view",
ref: function () {
@ -98025,7 +98032,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
(self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -98368,6 +98376,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -98412,7 +98421,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -101858,6 +101867,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
container: "body",
offset: this.constants.offset
},
searcher: {
@ -101931,7 +101941,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
},
value: {value: o.value || {}},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -104533,6 +104543,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -104574,7 +104585,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -106890,7 +106901,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});
@ -107159,7 +107170,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});
@ -111654,9 +111665,23 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
return yearStr + monthStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.month;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.month;
}
},
setValue: function (v) {
@ -112590,9 +112615,23 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
return yearStr + quarterStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.quarter;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.quarter;
}
},
_getText: function (obj) {

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

49
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

78
dist/widget.js vendored

@ -1084,23 +1084,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value,
height: c.height
});
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({
type: "bi.center_adapt",
type: "bi.vertical_adapt",
element: this,
items: [{
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [{
el: this.text,
rgap: 10
}, this.icon]
rgap: 5
}, {
type: "bi.icon_label",
width: 16
}]
});
},
@ -9326,6 +9319,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -9367,7 +9361,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -9627,6 +9621,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text,
// adapter: this.popup,
masker: {
container: "body",
offset: {
left: 0,
top: 0,
@ -9708,6 +9703,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
toggle: false,
el: this.trigger,
adjustLength: 1,
container: o.container,
popup: {
type: "bi.multi_select_popup_view",
ref: function () {
@ -9747,7 +9743,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
(self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -10090,6 +10087,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -10134,7 +10132,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -13580,6 +13578,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
container: "body",
offset: this.constants.offset
},
searcher: {
@ -13653,7 +13652,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
},
value: {value: o.value || {}},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -16255,6 +16254,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
container: o.container,
el: this.trigger,
adjustLength: 1,
popup: {
@ -16296,7 +16296,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});
@ -18612,7 +18612,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});
@ -18881,7 +18881,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});
@ -23376,9 +23376,23 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
return yearStr + monthStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.month;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.month;
}
},
setValue: function (v) {
@ -24312,9 +24326,23 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
return yearStr + quarterStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.quarter;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.quarter;
}
},
_getText: function (obj) {

5
src/base/layer/layer.popover.js

@ -55,8 +55,11 @@ BI.Popover = BI.inherit(BI.Widget, {
el: {
type: "bi.absolute",
items: [{
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header) : {
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
extraCls: "bi-font-bold"
}) : {
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
title: o.header,

3
src/base/single/button/listitem/icontextitem.js

@ -50,7 +50,8 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text)
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text),
lgap: 5
}))));
},

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -80,7 +80,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
return self.triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
},
left: 0,

1
src/case/combo/textvaluecombo/combo.textvaluesmall.js

@ -40,6 +40,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo",
element: this,
container: o.container,
adjustLength: 2,
el: this.trigger,
popup: {

12
src/css/base/single/button/button.css

@ -309,8 +309,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:hover .bi-button-mask,
.bi-basic-button.button-success:hover .bi-button-mask,
.bi-basic-button.button-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask,
.bi-basic-button.button-ignore:hover .bi-button-mask {
.bi-basic-button.button-error:hover .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #ffffff;
@ -318,12 +317,17 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-basic-button.button-common:active .bi-button-mask,
.bi-basic-button.button-success:active .bi-button-mask,
.bi-basic-button.button-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask,
.bi-basic-button.button-ignore:active .bi-button-mask {
.bi-basic-button.button-error:active .bi-button-mask {
opacity: 0.1;
filter: alpha(opacity=10);
background-color: #232E40;
}
.bi-basic-button.button-ignore:hover {
background-color: rgba(54, 133, 242, 0.05);
}
.bi-basic-button.button-ignore:active {
background-color: #eaf2fd;
}
.bi-basic-button .popup-content {
font-size: 14px;
}

3
src/css/core/utils/common.css

@ -121,6 +121,9 @@ textarea {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border {
border: 1px solid #3a3c53;
}

10
src/less/base/single/button/button.less

@ -154,7 +154,7 @@ body .bi-button, #body .bi-button {
}
.bi-basic-button {
&.button-common, &.button-success, &.button-warning, &.button-error, &.button-ignore {
&.button-common, &.button-success, &.button-warning, &.button-error {
&:hover{
& .bi-button-mask {
.opacity(0.1);
@ -168,6 +168,14 @@ body .bi-button, #body .bi-button {
}
}
}
&.button-ignore {
&:hover{
background-color: @color-bi-blue-5;
}
&:active{
background-color: @color-bi-blue-10;
}
}
& .popup-content{
font-size: @font-size-14;
}

4
src/less/core/utils/common.less

@ -141,6 +141,10 @@ textarea {
.border-radius(2px);
}
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark {
.bi-border {
border: 1px solid @color-bi-border-line-theme-dark;

17
src/widget/date/calendar/trigger.triangle.date.js

@ -29,23 +29,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value,
height: c.height
});
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({
type: "bi.center_adapt",
type: "bi.vertical_adapt",
element: this,
items: [{
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [{
el: this.text,
rgap: 10
}, this.icon]
rgap: 5
}, {
type: "bi.icon_label",
width: 16
}]
});
},

2
src/widget/multiselect/multiselect.combo.js

@ -161,7 +161,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});

4
src/widget/multiselect/multiselect.insert.combo.js

@ -33,6 +33,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text,
// adapter: this.popup,
masker: {
container: "body",
offset: {
left: 0,
top: 0,
@ -154,7 +155,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 &&
(self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -166,7 +166,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});

3
src/widget/multitree/multi.tree.combo.js

@ -40,6 +40,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
container: "body",
offset: this.constants.offset
},
searcher: {
@ -113,7 +114,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
},
value: {value: o.value || {}},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -166,7 +166,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
},
value: o.value,
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
}
});

2
src/widget/singleselect/singleselect.combo.js

@ -121,7 +121,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});

2
src/widget/singleselect/singleselect.insert.combo.js

@ -120,7 +120,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
}
},
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
return triggerBtn.element.find(e.target).length === 0 && (self.popup && !self.popup.element.__isMouseInBounds__(e));
},
value: o.value
});

20
src/widget/yearmonth/trigger.yearmonth.js

@ -194,9 +194,23 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month;
return yearStr + monthStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.month;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.month;
}
},
setValue: function (v) {

20
src/widget/yearquarter/trigger.yearquarter.js

@ -144,9 +144,23 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_getStaticTitle: function (value) {
value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year;
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter;
return yearStr + quarterStr;
var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
switch ((hasYear << 1) | hasMonth) {
// !hasYear && !hasMonth
case 0:
return "";
// !hasYear && hasMonth
case 1:
return value.quarter;
// hasYear && !hasMonth
case 2:
return value.year;
// hasYear && hasMonth
case 3:
default:
return value.year + "-" + value.quarter;
}
},
_getText: function (obj) {

Loading…
Cancel
Save