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

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

* commit '9330ec602b98cf1b47bc4b1549c7aff782573596':
  update
  update
  update
  update
  update
  update
  update
  BI-28465 && BI-28333 && BI-28340
es6
windy 6 years ago
parent
f59cab3850 9330ec602b
commit
b77d4e2e4c
52 changed files with 449 additions and 210 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      dist/_fineui.min.js
  2. 12
      dist/base.css
  3. 6
      dist/base.js
  4. 15
      dist/bundle.css
  5. 109
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 46
      dist/bundle.min.js
  8. 9
      dist/case.js
  9. 3
      dist/core.css
  10. 3
      dist/core_without_normalize.css
  11. 15
      dist/fineui.css
  12. 109
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 48
      dist/fineui.min.js
  15. 94
      dist/widget.js
  16. 6
      src/base/layer/layer.popover.js
  17. 1
      src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js
  18. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  19. 1
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  20. 1
      src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js
  21. 1
      src/case/combo/textvaluecombo/combo.textvaluesmall.js
  22. 1
      src/case/richeditor/plugins/combo.fontfamily.js
  23. 1
      src/case/richeditor/plugins/combo.sizechooser.js
  24. 1
      src/case/richeditor/richeditor.js
  25. 12
      src/css/base/single/button/button.css
  26. 3
      src/css/core/utils/common.css
  27. 10
      src/less/base/single/button/button.less
  28. 4
      src/less/core/utils/common.less
  29. 2
      src/widget/date/calendar/combo.month.date.js
  30. 1
      src/widget/date/calendar/picker.date.js
  31. 19
      src/widget/date/calendar/trigger.triangle.date.js
  32. 1
      src/widget/datetime/datetime.combo.js
  33. 1
      src/widget/dynamicdate/dynamicdate.combo.js
  34. 1
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  35. 1
      src/widget/month/combo.month.js
  36. 1
      src/widget/multilayerselecttree/multilayerselecttree.combo.js
  37. 1
      src/widget/multilayersingletree/multilayersingletree.combo.js
  38. 2
      src/widget/multiselect/multiselect.combo.js
  39. 4
      src/widget/multiselect/multiselect.insert.combo.js
  40. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  41. 4
      src/widget/multitree/multi.tree.combo.js
  42. 1
      src/widget/quarter/combo.quarter.js
  43. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  44. 1
      src/widget/selecttree/selecttree.combo.js
  45. 3
      src/widget/singleselect/singleselect.combo.js
  46. 3
      src/widget/singleselect/singleselect.insert.combo.js
  47. 1
      src/widget/singletree/singletree.combo.js
  48. 1
      src/widget/year/combo.year.js
  49. 1
      src/widget/yearmonth/combo.yearmonth.js
  50. 20
      src/widget/yearmonth/trigger.yearmonth.js
  51. 1
      src/widget/yearquarter/combo.yearquarter.js
  52. 20
      src/widget/yearquarter/trigger.yearquarter.js

48
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/base.css vendored
Unescape View File

@ -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-common:hover .bi-button-mask,
.bi-basic-button.button-success: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-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask, .bi-basic-button.button-error:hover .bi-button-mask {
.bi-basic-button.button-ignore:hover .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #ffffff; 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-common:active .bi-button-mask,
.bi-basic-button.button-success: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-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask, .bi-basic-button.button-error:active .bi-button-mask {
.bi-basic-button.button-ignore:active .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #232E40; 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 { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
} }

6
dist/base.js vendored
Unescape View File

@ -15424,11 +15424,13 @@ BI.Popover = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.absolute", type: "bi.absolute",
items: [{ 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", type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
text: o.header, text: o.header,
title: o.header,
textAlign: "left" textAlign: "left"
}, },
left: 10, left: 10,

15
dist/bundle.css vendored
Unescape View File

@ -399,6 +399,9 @@ textarea {
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; 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-common:hover .bi-button-mask,
.bi-basic-button.button-success: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-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask, .bi-basic-button.button-error:hover .bi-button-mask {
.bi-basic-button.button-ignore:hover .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #ffffff; 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-common:active .bi-button-mask,
.bi-basic-button.button-success: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-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask, .bi-basic-button.button-error:active .bi-button-mask {
.bi-basic-button.button-ignore:active .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #232E40; 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 { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
} }

109
dist/bundle.js vendored
Unescape View File

@ -51337,11 +51337,13 @@ BI.Popover = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.absolute", type: "bi.absolute",
items: [{ 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", type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
text: o.header, text: o.header,
title: o.header,
textAlign: "left" textAlign: "left"
}, },
left: 10, left: 10,
@ -78311,6 +78313,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}); });
this.editorIconCheckCombo = BI.createWidget({ this.editorIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -78835,7 +78838,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}], }],
hideChecker: function (e) { 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, left: 0,
@ -79189,6 +79192,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.textIconCheckCombo = BI.createWidget({ this.textIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -79268,6 +79272,7 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.SmallTextIconCheckCombo = BI.createWidget({ this.SmallTextIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -79483,6 +79488,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({ this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
element: this, element: this,
container: o.container,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
popup: { popup: {
@ -84431,6 +84437,7 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -84585,6 +84592,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -84692,6 +84700,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(editor); this.editor = BI.createWidget(editor);
return { return {
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
trigger: "click", trigger: "click",
direction: "top,right", direction: "top,right",
@ -88623,7 +88632,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
offsetStyle: "center", offsetStyle: "center",
container: null, container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -88835,6 +88844,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
items: [{ items: [{
type: "bi.horizontal", type: "bi.horizontal",
width: 100, width: 100,
rgap: 10,
items: [this.year, this.month] items: [this.year, this.month]
}] }]
}, { }, {
@ -89253,23 +89263,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: c.height height: c.height
}); });
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.vertical_adapt",
element: this, element: this,
items: [{ items: [{
type: "bi.center_adapt", el: this.text,
width: 50, rgap: 5
height: c.height, }, {
items: [{ type: "bi.icon_label",
el: this.text, width: 16
rgap: 10
}, this.icon]
}] }]
}); });
}, },
@ -89656,6 +89659,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}); });
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: opts.container,
toggle: false, toggle: false,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -91470,6 +91474,7 @@ BI.extend(BI.DynamicDateCard, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -92351,6 +92356,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -95183,6 +95189,7 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -95861,6 +95868,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -96417,6 +96425,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -97537,7 +97546,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -97797,6 +97806,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: { offset: {
left: 0, left: 0,
top: 0, top: 0,
@ -97918,7 +97928,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -98306,7 +98317,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}, },
hideChecker: function (e) { 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));
} }
}); });
@ -101752,6 +101763,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: this.constants.offset offset: this.constants.offset
}, },
searcher: { searcher: {
@ -101774,6 +101786,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -101825,7 +101838,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, },
value: {value: o.value || {}}, value: {value: o.value || {}},
hideChecker: function (e) { 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));
} }
}); });
@ -103728,6 +103741,7 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -104469,7 +104483,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -105645,6 +105659,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -106755,6 +106770,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -106785,7 +106801,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });
@ -107024,6 +107040,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -107054,7 +107071,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });
@ -109369,6 +109386,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -110276,6 +110294,7 @@ BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.i
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -111017,6 +111036,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -111549,9 +111569,23 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month; var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
return yearStr + monthStr; 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) { setValue: function (v) {
@ -112025,6 +112059,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -112485,9 +112520,23 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter; var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
return yearStr + quarterStr; 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) { _getText: function (obj) {

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

46
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/case.js vendored
Unescape View File

@ -5630,6 +5630,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}); });
this.editorIconCheckCombo = BI.createWidget({ this.editorIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -6154,7 +6155,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}], }],
hideChecker: function (e) { 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, left: 0,
@ -6508,6 +6509,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.textIconCheckCombo = BI.createWidget({ this.textIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -6587,6 +6589,7 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.SmallTextIconCheckCombo = BI.createWidget({ this.SmallTextIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -6802,6 +6805,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({ this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
element: this, element: this,
container: o.container,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
popup: { popup: {
@ -11750,6 +11754,7 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -11904,6 +11909,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -12011,6 +12017,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(editor); this.editor = BI.createWidget(editor);
return { return {
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
trigger: "click", trigger: "click",
direction: "top,right", direction: "top,right",

3
dist/core.css vendored
Unescape View File

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

3
dist/core_without_normalize.css vendored
Unescape View File

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

15
dist/fineui.css vendored
Unescape View File

@ -399,6 +399,9 @@ textarea {
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold {
font-weight: 600;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; 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-common:hover .bi-button-mask,
.bi-basic-button.button-success: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-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask, .bi-basic-button.button-error:hover .bi-button-mask {
.bi-basic-button.button-ignore:hover .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #ffffff; 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-common:active .bi-button-mask,
.bi-basic-button.button-success: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-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask, .bi-basic-button.button-error:active .bi-button-mask {
.bi-basic-button.button-ignore:active .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #232E40; 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 { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
} }

109
dist/fineui.js vendored
Unescape View File

@ -51586,11 +51586,13 @@ BI.Popover = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.absolute", type: "bi.absolute",
items: [{ 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", type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
text: o.header, text: o.header,
title: o.header,
textAlign: "left" textAlign: "left"
}, },
left: 10, left: 10,
@ -78560,6 +78562,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}); });
this.editorIconCheckCombo = BI.createWidget({ this.editorIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -79084,7 +79087,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}], }],
hideChecker: function (e) { 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, left: 0,
@ -79438,6 +79441,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.textIconCheckCombo = BI.createWidget({ this.textIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -79517,6 +79521,7 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.SmallTextIconCheckCombo = BI.createWidget({ this.SmallTextIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -79732,6 +79737,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
this.SmallTextValueCombo = BI.createWidget({ this.SmallTextValueCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
element: this, element: this,
container: o.container,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
popup: { popup: {
@ -84680,6 +84686,7 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -84834,6 +84841,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -84941,6 +84949,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(editor); this.editor = BI.createWidget(editor);
return { return {
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
trigger: "click", trigger: "click",
direction: "top,right", direction: "top,right",
@ -88872,7 +88881,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
offsetStyle: "center", offsetStyle: "center",
container: null, container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -89084,6 +89093,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
items: [{ items: [{
type: "bi.horizontal", type: "bi.horizontal",
width: 100, width: 100,
rgap: 10,
items: [this.year, this.month] items: [this.year, this.month]
}] }]
}, { }, {
@ -89502,23 +89512,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: c.height height: c.height
}); });
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.vertical_adapt",
element: this, element: this,
items: [{ items: [{
type: "bi.center_adapt", el: this.text,
width: 50, rgap: 5
height: c.height, }, {
items: [{ type: "bi.icon_label",
el: this.text, width: 16
rgap: 10
}, this.icon]
}] }]
}); });
}, },
@ -89905,6 +89908,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}); });
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: opts.container,
toggle: false, toggle: false,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -91719,6 +91723,7 @@ BI.extend(BI.DynamicDateCard, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -92600,6 +92605,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -95432,6 +95438,7 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -96110,6 +96117,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -96666,6 +96674,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -97786,7 +97795,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -98046,6 +98055,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: { offset: {
left: 0, left: 0,
top: 0, top: 0,
@ -98167,7 +98177,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -98555,7 +98566,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}, },
hideChecker: function (e) { 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));
} }
}); });
@ -102001,6 +102012,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: this.constants.offset offset: this.constants.offset
}, },
searcher: { searcher: {
@ -102023,6 +102035,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -102074,7 +102087,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, },
value: {value: o.value || {}}, value: {value: o.value || {}},
hideChecker: function (e) { 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));
} }
}); });
@ -103977,6 +103990,7 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -104718,7 +104732,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -105894,6 +105908,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -107004,6 +107019,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -107034,7 +107050,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });
@ -107273,6 +107289,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -107303,7 +107320,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });
@ -109618,6 +109635,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -110525,6 +110543,7 @@ BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.i
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -111266,6 +111285,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -111798,9 +111818,23 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month; var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
return yearStr + monthStr; 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) { setValue: function (v) {
@ -112274,6 +112308,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -112734,9 +112769,23 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter; var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
return yearStr + quarterStr; 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) { _getText: function (obj) {

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

48
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

94
dist/widget.js vendored
Unescape View File

@ -454,7 +454,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
offsetStyle: "center", offsetStyle: "center",
container: null, container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -666,6 +666,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
items: [{ items: [{
type: "bi.horizontal", type: "bi.horizontal",
width: 100, width: 100,
rgap: 10,
items: [this.year, this.month] items: [this.year, this.month]
}] }]
}, { }, {
@ -1084,23 +1085,16 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
value: o.value, value: o.value,
height: c.height height: c.height
}); });
this.icon = BI.createWidget({
type: "bi.icon",
width: c.iconWidth,
height: c.iconHeight
});
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.vertical_adapt",
element: this, element: this,
items: [{ items: [{
type: "bi.center_adapt", el: this.text,
width: 50, rgap: 5
height: c.height, }, {
items: [{ type: "bi.icon_label",
el: this.text, width: 16
rgap: 10
}, this.icon]
}] }]
}); });
}, },
@ -1487,6 +1481,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}); });
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: opts.container,
toggle: false, toggle: false,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -3301,6 +3296,7 @@ BI.extend(BI.DynamicDateCard, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -4182,6 +4178,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -7014,6 +7011,7 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -7692,6 +7690,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -8248,6 +8247,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -9368,7 +9368,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -9628,6 +9628,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: { offset: {
left: 0, left: 0,
top: 0, top: 0,
@ -9749,7 +9750,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -10137,7 +10139,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}, },
hideChecker: function (e) { 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));
} }
}); });
@ -13583,6 +13585,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: this.constants.offset offset: this.constants.offset
}, },
searcher: { searcher: {
@ -13605,6 +13608,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -13656,7 +13660,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, },
value: {value: o.value || {}}, value: {value: o.value || {}},
hideChecker: function (e) { 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));
} }
}); });
@ -15559,6 +15563,7 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -16300,7 +16305,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });
@ -17476,6 +17481,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -18586,6 +18592,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -18616,7 +18623,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });
@ -18855,6 +18862,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -18885,7 +18893,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });
@ -21200,6 +21208,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
@ -22107,6 +22116,7 @@ BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.i
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -22848,6 +22858,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -23380,9 +23391,23 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month; var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
return yearStr + monthStr; 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) { setValue: function (v) {
@ -23856,6 +23881,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,
@ -24316,9 +24342,23 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter; var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
return yearStr + quarterStr; 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) { _getText: function (obj) {

6
src/base/layer/layer.popover.js
Unescape View File

@ -55,11 +55,13 @@ BI.Popover = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.absolute", type: "bi.absolute",
items: [{ 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", type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
text: o.header, text: o.header,
title: o.header,
textAlign: "left" textAlign: "left"
}, },
left: 10, left: 10,

1
src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js
Unescape View File

@ -50,6 +50,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}); });
this.editorIconCheckCombo = BI.createWidget({ this.editorIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,

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

@ -80,7 +80,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}], }],
hideChecker: function (e) { 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, left: 0,

1
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
Unescape View File

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

1
src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js
Unescape View File

@ -39,6 +39,7 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
}); });
this.SmallTextIconCheckCombo = BI.createWidget({ this.SmallTextIconCheckCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,

1
src/case/combo/textvaluecombo/combo.textvaluesmall.js
Unescape View File

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

1
src/case/richeditor/plugins/combo.fontfamily.js
Unescape View File

@ -21,6 +21,7 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,

1
src/case/richeditor/plugins/combo.sizechooser.js
Unescape View File

@ -110,6 +110,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,

1
src/case/richeditor/richeditor.js
Unescape View File

@ -52,6 +52,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(editor); this.editor = BI.createWidget(editor);
return { return {
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
trigger: "click", trigger: "click",
direction: "top,right", direction: "top,right",

12
src/css/base/single/button/button.css
Unescape View File

@ -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-common:hover .bi-button-mask,
.bi-basic-button.button-success: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-warning:hover .bi-button-mask,
.bi-basic-button.button-error:hover .bi-button-mask, .bi-basic-button.button-error:hover .bi-button-mask {
.bi-basic-button.button-ignore:hover .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #ffffff; 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-common:active .bi-button-mask,
.bi-basic-button.button-success: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-warning:active .bi-button-mask,
.bi-basic-button.button-error:active .bi-button-mask, .bi-basic-button.button-error:active .bi-button-mask {
.bi-basic-button.button-ignore:active .bi-button-mask {
opacity: 0.1; opacity: 0.1;
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #232E40; 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 { .bi-basic-button .popup-content {
font-size: 14px; font-size: 14px;
} }

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

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

10
src/less/base/single/button/button.less
Unescape View File

@ -154,7 +154,7 @@ body .bi-button, #body .bi-button {
} }
.bi-basic-button { .bi-basic-button {
&.button-common, &.button-success, &.button-warning, &.button-error, &.button-ignore { &.button-common, &.button-success, &.button-warning, &.button-error {
&:hover{ &:hover{
& .bi-button-mask { & .bi-button-mask {
.opacity(0.1); .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{ & .popup-content{
font-size: @font-size-14; font-size: @font-size-14;
} }

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

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

2
src/widget/date/calendar/combo.month.date.js
Unescape View File

@ -34,7 +34,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
offsetStyle: "center", offsetStyle: "center",
container: null, container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,

1
src/widget/date/calendar/picker.date.js
Unescape View File

@ -105,6 +105,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
items: [{ items: [{
type: "bi.horizontal", type: "bi.horizontal",
width: 100, width: 100,
rgap: 10,
items: [this.year, this.month] items: [this.year, this.month]
}] }]
}, { }, {

19
src/widget/date/calendar/trigger.triangle.date.js
Unescape View File

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

1
src/widget/datetime/datetime.combo.js
Unescape View File

@ -58,6 +58,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}); });
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: opts.container,
toggle: false, toggle: false,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,

1
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -37,6 +37,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },

1
src/widget/dynamicdatetime/dynamicdatetime.combo.js
Unescape View File

@ -37,6 +37,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },

1
src/widget/month/combo.month.js
Unescape View File

@ -58,6 +58,7 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,

1
src/widget/multilayerselecttree/multilayerselecttree.combo.js
Unescape View File

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

1
src/widget/multilayersingletree/multilayersingletree.combo.js
Unescape View File

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

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

@ -161,7 +161,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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
Unescape View File

@ -33,6 +33,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: { offset: {
left: 0, left: 0,
top: 0, top: 0,
@ -154,7 +155,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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
Unescape View File

@ -166,7 +166,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
value: o.value value: o.value
}, },
hideChecker: function (e) { 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/multitree/multi.tree.combo.js
Unescape View File

@ -40,6 +40,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
container: "body",
offset: this.constants.offset offset: this.constants.offset
}, },
searcher: { searcher: {
@ -62,6 +63,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -113,7 +115,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, },
value: {value: o.value || {}}, value: {value: o.value || {}},
hideChecker: function (e) { 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));
} }
}); });

1
src/widget/quarter/combo.quarter.js
Unescape View File

@ -58,6 +58,7 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
element: this, element: this,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
Unescape View File

@ -166,7 +166,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
}, },
value: o.value, value: o.value,
hideChecker: function (e) { 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));
} }
}); });

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

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

3
src/widget/singleselect/singleselect.combo.js
Unescape View File

@ -91,6 +91,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -121,7 +122,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });

3
src/widget/singleselect/singleselect.insert.combo.js
Unescape View File

@ -90,6 +90,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
@ -120,7 +121,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
} }
}, },
hideChecker: function (e) { 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 value: o.value
}); });

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

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

1
src/widget/year/combo.year.js
Unescape View File

@ -47,6 +47,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,

1
src/widget/yearmonth/combo.yearmonth.js
Unescape View File

@ -56,6 +56,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,

20
src/widget/yearmonth/trigger.yearmonth.js
Unescape View File

@ -194,9 +194,23 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var monthStr = (BI.isNull(value.month) || BI.isEmptyString(value.month)) ? "" : "-" + value.month; var hasMonth = !(BI.isNull(value.month) || BI.isEmptyString(value.month));
return yearStr + monthStr; 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) { setValue: function (v) {

1
src/widget/yearquarter/combo.yearquarter.js
Unescape View File

@ -51,6 +51,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
el: this.trigger, el: this.trigger,

20
src/widget/yearquarter/trigger.yearquarter.js
Unescape View File

@ -144,9 +144,23 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_getStaticTitle: function (value) { _getStaticTitle: function (value) {
value = value || {}; value = value || {};
var yearStr = (BI.isNull(value.year) || BI.isEmptyString(value.year)) ? "" : value.year; var hasYear = !(BI.isNull(value.year) || BI.isEmptyString(value.year));
var quarterStr = (BI.isNull(value.quarter) || BI.isEmptyString(value.quarter)) ? "" : "-" + value.quarter; var hasMonth = !(BI.isNull(value.quarter) || BI.isEmptyString(value.quarter));
return yearStr + quarterStr; 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) { _getText: function (obj) {

Write Preview
Loading…
Cancel
Save