fay 7 years ago
parent
commit
c29df07686
  1. 2
      demo/js/case/combo/demo.icon_text_value_combo.js
  2. 7
      demo/js/case/combo/demo.text_value_combo.js
  3. 46
      dist/_fineui.min.js
  4. 6
      dist/base.css
  5. 29
      dist/base.js
  6. 91
      dist/bundle.css
  7. 116
      dist/bundle.js
  8. 2
      dist/bundle.min.css
  9. 70
      dist/bundle.min.js
  10. 19
      dist/case.js
  11. 83
      dist/core.css
  12. 83
      dist/core_without_normalize.css
  13. 9
      dist/demo.js
  14. 91
      dist/fineui.css
  15. 116
      dist/fineui.js
  16. 2
      dist/fineui.min.css
  17. 71
      dist/fineui.min.js
  18. 2
      dist/resource.css
  19. 68
      dist/widget.js
  20. 2
      public/css/font.css
  21. 25
      src/base/formula/formulaeditor.js
  22. 2
      src/base/layer/layer.popup.js
  23. 2
      src/base/single/tip/tip.bubble.js
  24. 1
      src/case/combo/iconcombo/popup.iconcombo.js
  25. 1
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js
  26. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  27. 1
      src/case/combo/searchtextvaluecombo/popup.searchtextvalue.js
  28. 1
      src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js
  29. 1
      src/case/combo/textvaluecombo/popup.textvalue.js
  30. 5
      src/case/trigger/trigger.icon.text.js
  31. 1
      src/component/allvaluechooser/combo.allvaluechooser.js
  32. 1
      src/component/valuechooser/combo.valuechooser.js
  33. 6
      src/css/base/formula/formulaeditor.css
  34. 83
      src/css/core/utils/common.css
  35. 2
      src/css/resource/font.css
  36. 10
      src/less/base/formula/formulaeditor.less
  37. 68
      src/less/core/utils/common.less
  38. 2
      src/less/resource/font.less
  39. 7
      src/widget/date/calendar/combo.month.date.js
  40. 4
      src/widget/date/calendar/picker.date.js
  41. 1
      src/widget/date/calendar/popup.calendar.date.js
  42. 1
      src/widget/datepane/card.static.datepane.js
  43. 3
      src/widget/datepane/datepane.js
  44. 1
      src/widget/datetime/datetime.combo.js
  45. 1
      src/widget/datetime/datetime.popup.js
  46. 1
      src/widget/datetimepane/card.static.datetimepane.js
  47. 3
      src/widget/datetimepane/datetimepane.js
  48. 1
      src/widget/dynamicdate/dynamicdate.combo.js
  49. 3
      src/widget/dynamicdate/dynamicdate.popup.js
  50. 1
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  51. 3
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  52. 1
      src/widget/multilayerselecttree/multilayerselecttree.popup.js
  53. 1
      src/widget/multilayersingletree/multilayersingletree.popup.js
  54. 7
      src/widget/multiselect/multiselect.loader.js
  55. 9
      src/widget/multiselect/multiselect.loader.nobar.js
  56. 1
      src/widget/selecttree/selecttree.popup.js
  57. 10
      src/widget/singleselect/singleselect.loader.js
  58. 1
      src/widget/singletree/singletree.popup.js
  59. 3
      src/widget/timeinterval/dateinterval.js
  60. 3
      src/widget/timeinterval/timeinterval.js
  61. 2
      ui/css/font.css

2
demo/js/case/combo/demo.icon_text_value_combo.js

@ -13,7 +13,7 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.icon_text_value_combo", type: "bi.icon_text_value_combo",
text: "默认值", text: "默认值",
// defaultIconCls: "next-page-h-font", // defaultIconCls: "next-page-h-font",
value: 23, value: 1,
width: 300, width: 300,
iconHeight: 16, iconHeight: 16,
iconWidth: 16, iconWidth: 16,

7
demo/js/case/combo/demo.text_value_combo.js

@ -8,7 +8,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
render: function () { render: function () {
var combo; var combo;
return { return {
type: "bi.horizontal_auto", type: "bi.vertical",
items: [{ items: [{
type: "bi.text_value_combo", type: "bi.text_value_combo",
ref: function () { ref: function () {
@ -39,12 +39,15 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
value: ["1", "2", "3"] value: ["1", "2", "3"]
} }
}, { }, {
type: "bi.button", type: "bi.popup_view",
width: 90, width: 90,
height: 25, height: 25,
handler: function () { handler: function () {
combo.setValue(3); combo.setValue(3);
} }
}, {
type: 'bi.label',
height: 1000
}], }],
vgap: 20 vgap: 20
}; };

46
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/base.css vendored

@ -700,6 +700,12 @@ li.CodeMirror-hint-active {
background: #08f; background: #08f;
color: white; color: white;
} }
.bi-formula-editor .error-field {
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;

29
dist/base.js vendored

@ -14534,7 +14534,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
value: "", value: "",
fieldTextValueMap: {}, fieldTextValueMap: {},
showHint: true, showHint: true,
lineHeight: 2 lineHeight: 2,
paramFormatter: function (v) {
return v;
}
}); });
}, },
_init: function () { _init: function () {
@ -14643,11 +14646,20 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
* @param field * @param field
*/ */
insertField: function (field) { insertField: function (field) {
var value = this.options.fieldTextValueMap[field];
var fieldId = this.options.paramFormatter(field);
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + field + "\u200b"); var showName = fieldId.replaceAll(/^<!.*!>$/, function (str) {
return str.substring(2, str.length - 2);
});
this.editor.replaceSelection("\u200b" + showName + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"}); var className = "fieldName";
if (BI.isNotNull(fieldId.match(/^<!.*!>$/))) {
className = "error-field";
}
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");
this.editor.focus(); this.editor.focus();
}, },
@ -14696,8 +14708,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
// 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符 // 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符
var dId = fieldMap[value.substr(i.from + 1, i.to - i.from - 2)]; var dId = i.marker.value;
if (!fields.contains(dId)) { if (!fields.contains(dId)) {
fields.push(dId); fields.push(dId);
} }
@ -14716,6 +14729,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length);
num = num + 2 - fieldNameLength; num = num + 2 - fieldNameLength;
@ -14735,10 +14749,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
var start = i.from + num + 1; var start = i.from + num + 1;
var end = fieldNameLength - 2; var end = fieldNameLength - 2;
var fieldId = fieldMap[value.substr(start, end)]; var fieldId = i.marker.value;
value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
num += fieldId.length - fieldNameLength + 3; num += fieldId.length - fieldNameLength + 3;
break; break;
@ -15594,7 +15609,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -20508,7 +20523,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label", type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level), cls: "bubble-text" + (" bubble-" + o.level),
text: o.text, text: o.text,
hgap: 10, hgap: 5,
height: 18 height: 18
})); }));
}, },

91
dist/bundle.css vendored

@ -394,6 +394,11 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;
} }
@ -741,7 +746,6 @@ textarea {
} }
.bi-list-item-active.active { .bi-list-item-active.active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active.active .bi-input { .bi-list-item-active.active .bi-input {
color: #3685f2; color: #3685f2;
@ -822,7 +826,6 @@ textarea {
.bi-list-item-active2:hover, .bi-list-item-active2:hover,
.bi-list-item-active2.hover { .bi-list-item-active2.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: #ffffff;
} }
.bi-list-item-active2:hover .bi-input, .bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input { .bi-list-item-active2.hover .bi-input {
@ -832,19 +835,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea { .bi-list-item-active2.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active2.active, .bi-list-item-active2:hover.bi-border,
.bi-list-item-active2.hover.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2:active { .bi-list-item-active2:active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input { .bi-list-item-active2:active .bi-input {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea { .bi-list-item-active2:active .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2:active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.active {
color: #ffffff;
background-color: #3685f2;
}
.bi-list-item-active2.active .bi-input {
color: #ffffff;
}
.bi-list-item-active2.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active2.active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.disabled, .bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover, .bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active { .bi-list-item-active2.disabled:active {
@ -913,20 +932,60 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important; color: #666666 !important;
} }
.bi-list-item-select:hover, .bi-list-item-active3:hover,
.bi-list-item-select.hover { .bi-list-item-active3.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
} }
.bi-list-item-select:hover .bi-input, .bi-list-item-active3:hover .bi-input,
.bi-list-item-select.hover .bi-input { .bi-list-item-active3.hover .bi-input {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-select:hover .bi-textarea, .bi-list-item-active3:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea { .bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:active, .bi-list-item-select:active,
.bi-list-item-select.active { .bi-list-item-select.active {
color: #ffffff; color: #ffffff;
@ -2397,6 +2456,12 @@ li.CodeMirror-hint-active {
background: #08f; background: #08f;
color: white; color: white;
} }
.bi-formula-editor .error-field {
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
@ -4662,7 +4727,7 @@ textarea::-webkit-scrollbar-thumb:hover {
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: #999999; color: rgba(54, 133, 242, 0.06);
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";

116
dist/bundle.js vendored

@ -50304,7 +50304,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
value: "", value: "",
fieldTextValueMap: {}, fieldTextValueMap: {},
showHint: true, showHint: true,
lineHeight: 2 lineHeight: 2,
paramFormatter: function (v) {
return v;
}
}); });
}, },
_init: function () { _init: function () {
@ -50413,11 +50416,20 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
* @param field * @param field
*/ */
insertField: function (field) { insertField: function (field) {
var value = this.options.fieldTextValueMap[field];
var fieldId = this.options.paramFormatter(field);
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + field + "\u200b"); var showName = fieldId.replaceAll(/^<!.*!>$/, function (str) {
return str.substring(2, str.length - 2);
});
this.editor.replaceSelection("\u200b" + showName + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"}); var className = "fieldName";
if (BI.isNotNull(fieldId.match(/^<!.*!>$/))) {
className = "error-field";
}
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");
this.editor.focus(); this.editor.focus();
}, },
@ -50466,8 +50478,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
// 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符 // 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符
var dId = fieldMap[value.substr(i.from + 1, i.to - i.from - 2)]; var dId = i.marker.value;
if (!fields.contains(dId)) { if (!fields.contains(dId)) {
fields.push(dId); fields.push(dId);
} }
@ -50486,6 +50499,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length);
num = num + 2 - fieldNameLength; num = num + 2 - fieldNameLength;
@ -50505,10 +50519,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
var start = i.from + num + 1; var start = i.from + num + 1;
var end = fieldNameLength - 2; var end = fieldNameLength - 2;
var fieldId = fieldMap[value.substr(start, end)]; var fieldId = i.marker.value;
value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
num += fieldId.length - fieldNameLength + 3; num += fieldId.length - fieldNameLength + 3;
break; break;
@ -51364,7 +51379,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -56278,7 +56293,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label", type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level), cls: "bubble-text" + (" bubble-" + o.level),
text: o.text, text: o.text,
hgap: 10, hgap: 5,
height: 18 height: 18
})); }));
}, },
@ -78258,6 +78273,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -78494,6 +78510,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -78585,7 +78602,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 242 maxHeight: 252
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -78684,6 +78701,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
return { return {
type: "bi.vertical", type: "bi.vertical",
vgap: 5,
items: [{ items: [{
type: "bi.button_group", type: "bi.button_group",
ref: function () { ref: function () {
@ -79087,6 +79105,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -79305,6 +79324,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -83493,10 +83513,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } finally {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -83504,6 +83524,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
@ -87283,7 +87304,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
items: [{ items: [{
el: { el: {
type: "bi.icon_change_button", type: "bi.icon_change_button",
cls: "icon-combo-trigger-icon " + o.iconCls, cls: "icon-combo-trigger-icon",
iconCls: o.iconCls,
ref: function (_ref) { ref: function (_ref) {
self.icon = _ref; self.icon = _ref;
}, },
@ -87291,7 +87313,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
disableSelected: true disableSelected: true
}, },
width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height) width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
}, },
{ {
el: this.text el: this.text
@ -88072,7 +88094,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.month_popup" type: "bi.month_popup",
behaviors: o.behaviors
}); });
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () { this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -88097,6 +88120,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE); self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
}, },
setValue: function (v) { setValue: function (v) {
@ -88251,6 +88278,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -88262,7 +88290,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
}); });
this.month = BI.createWidget({ this.month = BI.createWidget({
type: "bi.month_date_combo" type: "bi.month_date_combo",
behaviors: o.behaviors
}); });
this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () { this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () {
self.setValue({ self.setValue({
@ -88496,6 +88525,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
}; };
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -88751,6 +88781,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -88855,7 +88886,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -88912,6 +88943,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
case BI.DynamicDatePane.Static: case BI.DynamicDatePane.Static:
return { return {
type: "bi.static_date_pane_card", type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {
@ -89039,6 +89071,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value value: opts.value
@ -89165,6 +89198,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({ this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max max: self.options.max
}); });
@ -89492,6 +89526,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -89623,7 +89658,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -89680,6 +89715,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
case BI.DynamicDateTimePane.Static: case BI.DynamicDateTimePane.Static:
return { return {
type: "bi.static_date_time_pane_card", type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {
@ -90908,6 +90944,7 @@ BI.extend(BI.DynamicDateCard, {
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_popup", type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,
@ -91245,7 +91282,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -91284,6 +91321,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default: default:
return { return {
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
listeners: [{ listeners: [{
@ -91781,6 +91819,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_time_popup", type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,
@ -92008,7 +92047,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -92049,6 +92088,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
ref: function () { ref: function () {
@ -96193,6 +96233,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -96754,6 +96795,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -98840,7 +98882,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.select_list", type: "bi.select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -98907,6 +98948,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -99013,7 +99060,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({ this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane", type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
el: { el: {
type: "bi.loader", type: "bi.loader",
@ -99077,6 +99123,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}, opts.el)); }, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -105891,6 +105945,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -107485,7 +107540,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value; this.storeValue = opts.value;
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.single_select_list", type: "bi.single_select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -107542,6 +107596,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -107554,6 +107616,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, { return BI.createItems(items, {
type: "bi.single_select_combo.item", type: "bi.single_select_combo.item",
logic: this.options.logic, logic: this.options.logic,
cls: "bi-list-item-active",
height: 24, height: 24,
selected: false selected: false
}); });
@ -109520,6 +109583,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -109790,9 +109854,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_combo", type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {
@ -109969,9 +110034,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo", type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {
@ -112713,6 +112779,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
text: o.text,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -113704,6 +113771,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
element: this, element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

70
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/case.js vendored

@ -5774,6 +5774,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -6010,6 +6011,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -6101,7 +6103,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 242 maxHeight: 252
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -6200,6 +6202,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
return { return {
type: "bi.vertical", type: "bi.vertical",
vgap: 5,
items: [{ items: [{
type: "bi.button_group", type: "bi.button_group",
ref: function () { ref: function () {
@ -6603,6 +6606,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -6821,6 +6825,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -11009,10 +11014,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } finally {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -11020,6 +11025,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
@ -14799,7 +14805,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
items: [{ items: [{
el: { el: {
type: "bi.icon_change_button", type: "bi.icon_change_button",
cls: "icon-combo-trigger-icon " + o.iconCls, cls: "icon-combo-trigger-icon",
iconCls: o.iconCls,
ref: function (_ref) { ref: function (_ref) {
self.icon = _ref; self.icon = _ref;
}, },
@ -14807,7 +14814,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
disableSelected: true disableSelected: true
}, },
width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height) width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
}, },
{ {
el: this.text el: this.text

83
dist/core.css vendored

@ -394,6 +394,11 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;
} }
@ -741,7 +746,6 @@ textarea {
} }
.bi-list-item-active.active { .bi-list-item-active.active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active.active .bi-input { .bi-list-item-active.active .bi-input {
color: #3685f2; color: #3685f2;
@ -822,7 +826,6 @@ textarea {
.bi-list-item-active2:hover, .bi-list-item-active2:hover,
.bi-list-item-active2.hover { .bi-list-item-active2.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: #ffffff;
} }
.bi-list-item-active2:hover .bi-input, .bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input { .bi-list-item-active2.hover .bi-input {
@ -832,19 +835,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea { .bi-list-item-active2.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active2.active, .bi-list-item-active2:hover.bi-border,
.bi-list-item-active2.hover.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2:active { .bi-list-item-active2:active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input { .bi-list-item-active2:active .bi-input {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea { .bi-list-item-active2:active .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2:active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.active {
color: #ffffff;
background-color: #3685f2;
}
.bi-list-item-active2.active .bi-input {
color: #ffffff;
}
.bi-list-item-active2.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active2.active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.disabled, .bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover, .bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active { .bi-list-item-active2.disabled:active {
@ -913,20 +932,60 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important; color: #666666 !important;
} }
.bi-list-item-select:hover, .bi-list-item-active3:hover,
.bi-list-item-select.hover { .bi-list-item-active3.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
} }
.bi-list-item-select:hover .bi-input, .bi-list-item-active3:hover .bi-input,
.bi-list-item-select.hover .bi-input { .bi-list-item-active3.hover .bi-input {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-select:hover .bi-textarea, .bi-list-item-active3:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea { .bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:active, .bi-list-item-select:active,
.bi-list-item-select.active { .bi-list-item-select.active {
color: #ffffff; color: #ffffff;

83
dist/core_without_normalize.css vendored

@ -116,6 +116,11 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;
} }
@ -463,7 +468,6 @@ textarea {
} }
.bi-list-item-active.active { .bi-list-item-active.active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active.active .bi-input { .bi-list-item-active.active .bi-input {
color: #3685f2; color: #3685f2;
@ -544,7 +548,6 @@ textarea {
.bi-list-item-active2:hover, .bi-list-item-active2:hover,
.bi-list-item-active2.hover { .bi-list-item-active2.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: #ffffff;
} }
.bi-list-item-active2:hover .bi-input, .bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input { .bi-list-item-active2.hover .bi-input {
@ -554,19 +557,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea { .bi-list-item-active2.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active2.active, .bi-list-item-active2:hover.bi-border,
.bi-list-item-active2.hover.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2:active { .bi-list-item-active2:active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input { .bi-list-item-active2:active .bi-input {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea { .bi-list-item-active2:active .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2:active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.active {
color: #ffffff;
background-color: #3685f2;
}
.bi-list-item-active2.active .bi-input {
color: #ffffff;
}
.bi-list-item-active2.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active2.active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.disabled, .bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover, .bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active { .bi-list-item-active2.disabled:active {
@ -635,20 +654,60 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important; color: #666666 !important;
} }
.bi-list-item-select:hover, .bi-list-item-active3:hover,
.bi-list-item-select.hover { .bi-list-item-active3.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
} }
.bi-list-item-select:hover .bi-input, .bi-list-item-active3:hover .bi-input,
.bi-list-item-select.hover .bi-input { .bi-list-item-active3.hover .bi-input {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-select:hover .bi-textarea, .bi-list-item-active3:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea { .bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:active, .bi-list-item-select:active,
.bi-list-item-select.active { .bi-list-item-select.active {
color: #ffffff; color: #ffffff;

9
dist/demo.js vendored

@ -2030,7 +2030,7 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.icon_text_value_combo", type: "bi.icon_text_value_combo",
text: "默认值", text: "默认值",
// defaultIconCls: "next-page-h-font", // defaultIconCls: "next-page-h-font",
value: 23, value: 1,
width: 300, width: 300,
iconHeight: 16, iconHeight: 16,
iconWidth: 16, iconWidth: 16,
@ -2191,7 +2191,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
render: function () { render: function () {
var combo; var combo;
return { return {
type: "bi.horizontal_auto", type: "bi.vertical",
items: [{ items: [{
type: "bi.text_value_combo", type: "bi.text_value_combo",
ref: function () { ref: function () {
@ -2222,12 +2222,15 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
value: ["1", "2", "3"] value: ["1", "2", "3"]
} }
}, { }, {
type: "bi.button", type: "bi.popup_view",
width: 90, width: 90,
height: 25, height: 25,
handler: function () { handler: function () {
combo.setValue(3); combo.setValue(3);
} }
}, {
type: 'bi.label',
height: 1000
}], }],
vgap: 20 vgap: 20
}; };

91
dist/fineui.css vendored

@ -394,6 +394,11 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;
} }
@ -741,7 +746,6 @@ textarea {
} }
.bi-list-item-active.active { .bi-list-item-active.active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active.active .bi-input { .bi-list-item-active.active .bi-input {
color: #3685f2; color: #3685f2;
@ -822,7 +826,6 @@ textarea {
.bi-list-item-active2:hover, .bi-list-item-active2:hover,
.bi-list-item-active2.hover { .bi-list-item-active2.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: #ffffff;
} }
.bi-list-item-active2:hover .bi-input, .bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input { .bi-list-item-active2.hover .bi-input {
@ -832,19 +835,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea { .bi-list-item-active2.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active2.active, .bi-list-item-active2:hover.bi-border,
.bi-list-item-active2.hover.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2:active { .bi-list-item-active2:active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input { .bi-list-item-active2:active .bi-input {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea { .bi-list-item-active2:active .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2:active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.active {
color: #ffffff;
background-color: #3685f2;
}
.bi-list-item-active2.active .bi-input {
color: #ffffff;
}
.bi-list-item-active2.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active2.active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.disabled, .bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover, .bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active { .bi-list-item-active2.disabled:active {
@ -913,20 +932,60 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important; color: #666666 !important;
} }
.bi-list-item-select:hover, .bi-list-item-active3:hover,
.bi-list-item-select.hover { .bi-list-item-active3.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
} }
.bi-list-item-select:hover .bi-input, .bi-list-item-active3:hover .bi-input,
.bi-list-item-select.hover .bi-input { .bi-list-item-active3.hover .bi-input {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-select:hover .bi-textarea, .bi-list-item-active3:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea { .bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:active, .bi-list-item-select:active,
.bi-list-item-select.active { .bi-list-item-select.active {
color: #ffffff; color: #ffffff;
@ -2397,6 +2456,12 @@ li.CodeMirror-hint-active {
background: #08f; background: #08f;
color: white; color: white;
} }
.bi-formula-editor .error-field {
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
@ -4662,7 +4727,7 @@ textarea::-webkit-scrollbar-thumb:hover {
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: #999999; color: rgba(54, 133, 242, 0.06);
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";

116
dist/fineui.js vendored

@ -50547,7 +50547,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
value: "", value: "",
fieldTextValueMap: {}, fieldTextValueMap: {},
showHint: true, showHint: true,
lineHeight: 2 lineHeight: 2,
paramFormatter: function (v) {
return v;
}
}); });
}, },
_init: function () { _init: function () {
@ -50656,11 +50659,20 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
* @param field * @param field
*/ */
insertField: function (field) { insertField: function (field) {
var value = this.options.fieldTextValueMap[field];
var fieldId = this.options.paramFormatter(field);
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + field + "\u200b"); var showName = fieldId.replaceAll(/^<!.*!>$/, function (str) {
return str.substring(2, str.length - 2);
});
this.editor.replaceSelection("\u200b" + showName + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"}); var className = "fieldName";
if (BI.isNotNull(fieldId.match(/^<!.*!>$/))) {
className = "error-field";
}
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");
this.editor.focus(); this.editor.focus();
}, },
@ -50709,8 +50721,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
// 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符 // 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符
var dId = fieldMap[value.substr(i.from + 1, i.to - i.from - 2)]; var dId = i.marker.value;
if (!fields.contains(dId)) { if (!fields.contains(dId)) {
fields.push(dId); fields.push(dId);
} }
@ -50729,6 +50742,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length);
num = num + 2 - fieldNameLength; num = num + 2 - fieldNameLength;
@ -50748,10 +50762,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
var start = i.from + num + 1; var start = i.from + num + 1;
var end = fieldNameLength - 2; var end = fieldNameLength - 2;
var fieldId = fieldMap[value.substr(start, end)]; var fieldId = i.marker.value;
value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
num += fieldId.length - fieldNameLength + 3; num += fieldId.length - fieldNameLength + 3;
break; break;
@ -51607,7 +51622,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -56521,7 +56536,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label", type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level), cls: "bubble-text" + (" bubble-" + o.level),
text: o.text, text: o.text,
hgap: 10, hgap: 5,
height: 18 height: 18
})); }));
}, },
@ -78501,6 +78516,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -78737,6 +78753,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -78828,7 +78845,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 242 maxHeight: 252
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -78927,6 +78944,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
return { return {
type: "bi.vertical", type: "bi.vertical",
vgap: 5,
items: [{ items: [{
type: "bi.button_group", type: "bi.button_group",
ref: function () { ref: function () {
@ -79330,6 +79348,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -79548,6 +79567,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },
@ -83736,10 +83756,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
insertHTML: function (html) { insertHTML: function (html) {
var range = this.getRng(); var range = this.getRng();
if (document.queryCommandState("insertHTML")) { try {
// W3C
this.nicCommand("insertHTML", html); this.nicCommand("insertHTML", html);
} else if (range.insertNode) { } finally {
if (range.insertNode) {
// IE // IE
range.deleteContents(); range.deleteContents();
range.insertNode($(html)[0]); range.insertNode($(html)[0]);
@ -83747,6 +83767,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
// IE <= 10 // IE <= 10
range.pasteHTML(html); range.pasteHTML(html);
} }
}
}, },
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
@ -87526,7 +87547,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
items: [{ items: [{
el: { el: {
type: "bi.icon_change_button", type: "bi.icon_change_button",
cls: "icon-combo-trigger-icon " + o.iconCls, cls: "icon-combo-trigger-icon",
iconCls: o.iconCls,
ref: function (_ref) { ref: function (_ref) {
self.icon = _ref; self.icon = _ref;
}, },
@ -87534,7 +87556,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
disableSelected: true disableSelected: true
}, },
width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height) width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
}, },
{ {
el: this.text el: this.text
@ -88315,7 +88337,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.month_popup" type: "bi.month_popup",
behaviors: o.behaviors
}); });
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () { this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -88340,6 +88363,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE); self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
}, },
setValue: function (v) { setValue: function (v) {
@ -88494,6 +88521,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -88505,7 +88533,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
}); });
this.month = BI.createWidget({ this.month = BI.createWidget({
type: "bi.month_date_combo" type: "bi.month_date_combo",
behaviors: o.behaviors
}); });
this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () { this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () {
self.setValue({ self.setValue({
@ -88739,6 +88768,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
}; };
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -88994,6 +89024,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -89098,7 +89129,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -89155,6 +89186,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
case BI.DynamicDatePane.Static: case BI.DynamicDatePane.Static:
return { return {
type: "bi.static_date_pane_card", type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {
@ -89282,6 +89314,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value value: opts.value
@ -89408,6 +89441,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({ this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max max: self.options.max
}); });
@ -89735,6 +89769,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -89866,7 +89901,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -89923,6 +89958,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
case BI.DynamicDateTimePane.Static: case BI.DynamicDateTimePane.Static:
return { return {
type: "bi.static_date_time_pane_card", type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {
@ -91151,6 +91187,7 @@ BI.extend(BI.DynamicDateCard, {
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_popup", type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,
@ -91488,7 +91525,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -91527,6 +91564,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default: default:
return { return {
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
listeners: [{ listeners: [{
@ -92024,6 +92062,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_time_popup", type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,
@ -92251,7 +92290,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -92292,6 +92331,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
ref: function () { ref: function () {
@ -96436,6 +96476,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -96997,6 +97038,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -99083,7 +99125,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.select_list", type: "bi.select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -99150,6 +99191,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -99256,7 +99303,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({ this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane", type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
el: { el: {
type: "bi.loader", type: "bi.loader",
@ -99320,6 +99366,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}, opts.el)); }, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -106134,6 +106188,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -107728,7 +107783,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value; this.storeValue = opts.value;
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.single_select_list", type: "bi.single_select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -107785,6 +107839,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -107797,6 +107859,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, { return BI.createItems(items, {
type: "bi.single_select_combo.item", type: "bi.single_select_combo.item",
logic: this.options.logic, logic: this.options.logic,
cls: "bi-list-item-active",
height: 24, height: 24,
selected: false selected: false
}); });
@ -109763,6 +109826,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -110033,9 +110097,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_combo", type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {
@ -110212,9 +110277,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo", type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {
@ -112956,6 +113022,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
text: o.text,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -113947,6 +114014,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
element: this, element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

71
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored

@ -540,7 +540,7 @@ textarea::-webkit-scrollbar-thumb:hover {
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: #999999; color: rgba(54, 133, 242, 0.06);
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";

68
dist/widget.js vendored

@ -441,7 +441,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.month_popup" type: "bi.month_popup",
behaviors: o.behaviors
}); });
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () { this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -466,6 +467,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE); self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
}, },
setValue: function (v) { setValue: function (v) {
@ -620,6 +625,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -631,7 +637,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
}); });
this.month = BI.createWidget({ this.month = BI.createWidget({
type: "bi.month_date_combo" type: "bi.month_date_combo",
behaviors: o.behaviors
}); });
this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () { this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () {
self.setValue({ self.setValue({
@ -865,6 +872,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
}; };
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -1120,6 +1128,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -1224,7 +1233,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -1281,6 +1290,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
case BI.DynamicDatePane.Static: case BI.DynamicDatePane.Static:
return { return {
type: "bi.static_date_pane_card", type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {
@ -1408,6 +1418,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value value: opts.value
@ -1534,6 +1545,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({ this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max max: self.options.max
}); });
@ -1861,6 +1873,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -1992,7 +2005,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -2049,6 +2062,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
case BI.DynamicDateTimePane.Static: case BI.DynamicDateTimePane.Static:
return { return {
type: "bi.static_date_time_pane_card", type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {
@ -3277,6 +3291,7 @@ BI.extend(BI.DynamicDateCard, {
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_popup", type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,
@ -3614,7 +3629,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -3653,6 +3668,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default: default:
return { return {
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
listeners: [{ listeners: [{
@ -4150,6 +4166,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_time_popup", type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,
@ -4377,7 +4394,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -4418,6 +4435,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
ref: function () { ref: function () {
@ -8562,6 +8580,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -9123,6 +9142,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -11209,7 +11229,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.select_list", type: "bi.select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -11276,6 +11295,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -11382,7 +11407,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({ this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane", type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
el: { el: {
type: "bi.loader", type: "bi.loader",
@ -11446,6 +11470,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}, opts.el)); }, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -18260,6 +18292,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -19854,7 +19887,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value; this.storeValue = opts.value;
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.single_select_list", type: "bi.single_select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -19911,6 +19943,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -19923,6 +19963,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, { return BI.createItems(items, {
type: "bi.single_select_combo.item", type: "bi.single_select_combo.item",
logic: this.options.logic, logic: this.options.logic,
cls: "bi-list-item-active",
height: 24, height: 24,
selected: false selected: false
}); });
@ -21889,6 +21930,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });
@ -22159,9 +22201,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_combo", type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {
@ -22338,9 +22381,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo", type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {
@ -25082,6 +25126,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
text: o.text,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -26073,6 +26118,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
element: this, element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

2
public/css/font.css

@ -214,7 +214,7 @@
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: #999999; color: rgba(54, 133, 242, 0.06);
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";

25
src/base/formula/formulaeditor.js

@ -11,7 +11,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
value: "", value: "",
fieldTextValueMap: {}, fieldTextValueMap: {},
showHint: true, showHint: true,
lineHeight: 2 lineHeight: 2,
paramFormatter: function (v) {
return v;
}
}); });
}, },
_init: function () { _init: function () {
@ -120,11 +123,20 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
* @param field * @param field
*/ */
insertField: function (field) { insertField: function (field) {
var value = this.options.fieldTextValueMap[field];
var fieldId = this.options.paramFormatter(field);
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + field + "\u200b"); var showName = fieldId.replaceAll(/^<!.*!>$/, function (str) {
return str.substring(2, str.length - 2);
});
this.editor.replaceSelection("\u200b" + showName + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"}); var className = "fieldName";
if (BI.isNotNull(fieldId.match(/^<!.*!>$/))) {
className = "error-field";
}
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");
this.editor.focus(); this.editor.focus();
}, },
@ -173,8 +185,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
// 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符 // 因为插入字段的时候首尾加了不可见字符,所以首尾缩进一个字符
var dId = fieldMap[value.substr(i.from + 1, i.to - i.from - 2)]; var dId = i.marker.value;
if (!fields.contains(dId)) { if (!fields.contains(dId)) {
fields.push(dId); fields.push(dId);
} }
@ -193,6 +206,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$a" + value.substr(i.to + num, value.length);
num = num + 2 - fieldNameLength; num = num + 2 - fieldNameLength;
@ -212,10 +226,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_.forEach(line.markedSpans, function (i, ms) { _.forEach(line.markedSpans, function (i, ms) {
switch (i.marker.className) { switch (i.marker.className) {
case "fieldName": case "fieldName":
case "error-field":
var fieldNameLength = i.to - i.from; var fieldNameLength = i.to - i.from;
var start = i.from + num + 1; var start = i.from + num + 1;
var end = fieldNameLength - 2; var end = fieldNameLength - 2;
var fieldId = fieldMap[value.substr(start, end)]; var fieldId = i.marker.value;
value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length); value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
num += fieldId.length - fieldNameLength + 3; num += fieldId.length - fieldNameLength + 3;
break; break;

2
src/base/layer/layer.popup.js

@ -44,7 +44,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;

2
src/base/single/tip/tip.bubble.js

@ -36,7 +36,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
type: "bi.label", type: "bi.label",
cls: "bubble-text" + (" bubble-" + o.level), cls: "bubble-text" + (" bubble-" + o.level),
text: o.text, text: o.text,
hgap: 10, hgap: 5,
height: 18 height: 18
})); }));
}, },

1
src/case/combo/iconcombo/popup.iconcombo.js

@ -38,6 +38,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },

1
src/case/combo/icontextvaluecombo/popup.icontextvalue.js

@ -36,6 +36,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },

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

@ -63,7 +63,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 242 maxHeight: 252
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,

1
src/case/combo/searchtextvaluecombo/popup.searchtextvalue.js

@ -11,6 +11,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
return { return {
type: "bi.vertical", type: "bi.vertical",
vgap: 5,
items: [{ items: [{
type: "bi.button_group", type: "bi.button_group",
ref: function () { ref: function () {

1
src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js

@ -29,6 +29,7 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },

1
src/case/combo/textvaluecombo/popup.textvalue.js

@ -34,6 +34,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.popup] items: [this.popup]
}); });
}, },

5
src/case/trigger/trigger.icon.text.js

@ -44,7 +44,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
items: [{ items: [{
el: { el: {
type: "bi.icon_change_button", type: "bi.icon_change_button",
cls: "icon-combo-trigger-icon " + o.iconCls, cls: "icon-combo-trigger-icon",
iconCls: o.iconCls,
ref: function (_ref) { ref: function (_ref) {
self.icon = _ref; self.icon = _ref;
}, },
@ -52,7 +53,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
disableSelected: true disableSelected: true
}, },
width: BI.isEmptyString(o.iconCls)? 0 : (o.triggerWidth || o.height) width: BI.isEmptyString(o.iconCls) ? 0 : (o.triggerWidth || o.height)
}, },
{ {
el: this.text el: this.text

1
src/component/allvaluechooser/combo.allvaluechooser.js

@ -27,6 +27,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
text: o.text,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),

1
src/component/valuechooser/combo.valuechooser.js

@ -28,6 +28,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_combo",
element: this, element: this,
text: o.text,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width, width: o.width,

6
src/css/base/formula/formulaeditor.css

@ -0,0 +1,6 @@
.bi-formula-editor .error-field {
color: #ff4949;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}

83
src/css/core/utils/common.css

@ -116,6 +116,11 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;
} }
@ -463,7 +468,6 @@ textarea {
} }
.bi-list-item-active.active { .bi-list-item-active.active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active.active .bi-input { .bi-list-item-active.active .bi-input {
color: #3685f2; color: #3685f2;
@ -544,7 +548,6 @@ textarea {
.bi-list-item-active2:hover, .bi-list-item-active2:hover,
.bi-list-item-active2.hover { .bi-list-item-active2.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: #ffffff;
} }
.bi-list-item-active2:hover .bi-input, .bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input { .bi-list-item-active2.hover .bi-input {
@ -554,19 +557,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea { .bi-list-item-active2.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active2.active, .bi-list-item-active2:hover.bi-border,
.bi-list-item-active2.hover.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2:active { .bi-list-item-active2:active {
color: #3685f2; color: #3685f2;
background-color: #ffffff;
} }
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input { .bi-list-item-active2:active .bi-input {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea { .bi-list-item-active2:active .bi-textarea {
color: #3685f2; color: #3685f2;
} }
.bi-list-item-active2:active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.active {
color: #ffffff;
background-color: #3685f2;
}
.bi-list-item-active2.active .bi-input {
color: #ffffff;
}
.bi-list-item-active2.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active2.active.bi-border {
border-color: #3685f2;
}
.bi-list-item-active2.disabled, .bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover, .bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active { .bi-list-item-active2.disabled:active {
@ -635,20 +654,60 @@ textarea {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important; color: #666666 !important;
} }
.bi-list-item-select:hover, .bi-list-item-active3:hover,
.bi-list-item-select.hover { .bi-list-item-active3.hover {
color: #1a1a1a; color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06); background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
} }
.bi-list-item-select:hover .bi-input, .bi-list-item-active3:hover .bi-input,
.bi-list-item-select.hover .bi-input { .bi-list-item-active3.hover .bi-input {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-select:hover .bi-textarea, .bi-list-item-active3:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea { .bi-list-item-active3.hover .bi-textarea {
color: #1a1a1a; color: #1a1a1a;
} }
.bi-list-item-active3:active,
.bi-list-item-active3.active {
color: #3685f2;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-active3:active .bi-input,
.bi-list-item-active3.active .bi-input {
color: #3685f2;
}
.bi-list-item-active3:active .bi-textarea,
.bi-list-item-active3.active .bi-textarea {
color: #3685f2;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:active, .bi-list-item-select:active,
.bi-list-item-select.active { .bi-list-item-select.active {
color: #ffffff; color: #ffffff;

2
src/css/resource/font.css

@ -214,7 +214,7 @@
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: #999999; color: rgba(54, 133, 242, 0.06);
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";

10
src/less/base/formula/formulaeditor.less

@ -0,0 +1,10 @@
@import "../../index";
.bi-formula-editor {
& .error-field {
color: @color-bi-text-failure;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
}

68
src/less/core/utils/common.less

@ -137,6 +137,10 @@ textarea {
border: 1px solid @color-bi-border-line; border: 1px solid @color-bi-border-line;
} }
.bi-border-radius {
.border-radius(2px);
}
.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;
@ -480,7 +484,7 @@ textarea {
} }
} }
//文字和背景hover和active时变化 //文字和背景hover和active时变化, hover和点击时文本和背景变化,active后文本变化,背景不变化
.bi-list-item-active { .bi-list-item-active {
&:hover, &.hover { &:hover, &.hover {
color: @color-bi-text-black; color: @color-bi-text-black;
@ -510,7 +514,6 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
} }
background-color: @color-bi-background-default;
} }
&.disabled { &.disabled {
&, &:hover, &:active { &, &:hover, &:active {
@ -569,7 +572,7 @@ textarea {
} }
} }
//文字和背景hover和active时变化 //文字和背景hover和active时变化 hover和点击时边框变化,active后背景和边框变化
.bi-list-item-active2 { .bi-list-item-active2 {
&:hover, &.hover { &:hover, &.hover {
color: @color-bi-text-black; color: @color-bi-text-black;
@ -579,9 +582,11 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text-black; color: @color-bi-text-black;
} }
background-color: @color-bi-background-default; &.bi-border {
border-color: @color-bi-border-highlight;
} }
&.active, &:active { }
&:active {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
& .bi-input { & .bi-input {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
@ -589,7 +594,22 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
} }
background-color: @color-bi-background-default; &.bi-border {
border-color: @color-bi-border-highlight;
}
}
&.active {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
&.bi-border {
border-color: @color-bi-border-highlight;
}
background-color: @color-bi-background-highlight;
} }
&.disabled { &.disabled {
&, &:hover, &:active { &, &:hover, &:active {
@ -648,8 +668,8 @@ textarea {
} }
} }
// 激活和选中时背景高亮 //文字和背景hover和active时变化 hover
.bi-list-item-select { .bi-list-item-active3 {
&:hover, &.hover { &:hover, &.hover {
color: @color-bi-text-black; color: @color-bi-text-black;
& .bi-input { & .bi-input {
@ -660,6 +680,38 @@ textarea {
} }
.background-color(@color-bi-background-highlight, 6%); .background-color(@color-bi-background-highlight, 6%);
} }
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 6%);
}
&.disabled {
&, &:hover, &:active {
background-color: transparent !important;
color: @color-bi-text-disabled !important;
& .bi-input {
color: @color-bi-text-disabled !important;
}
& .bi-textarea {
color: @color-bi-text-disabled !important;
}
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
// 激活和选中时背景高亮
.bi-list-item-select {
&:hover, &.hover {
.background-color(@color-bi-background-highlight, 6%);
}
&:active, &.active { &:active, &.active {
color: @color-bi-text; color: @color-bi-text;
& .bi-input { & .bi-input {

2
src/less/resource/font.less

@ -38,7 +38,7 @@
.font(dot-font, @font-dot, @color-bi-text-black); .font(dot-font, @font-dot, @color-bi-text-black);
.font-hover(dot-h-font, @font-dot, @color-bi-text-black); .font-hover(dot-h-font, @font-dot, @color-bi-text-black);
.font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-black); .font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-black);
.font-effect(dot-e-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-highlight, @color-bi-text-black); .font-effect(dot-e-font, @font-dot, @color-bi-text, fade(@color-bi-text-highlight, 6), @color-bi-text-highlight, @color-bi-text-black);
//向右展开子菜单 //向右展开子菜单
.font(pull-right-font, @font-right-triangle); .font(pull-right-font, @font-right-triangle);

7
src/widget/date/calendar/combo.month.date.js

@ -21,7 +21,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.month_popup" type: "bi.month_popup",
behaviors: o.behaviors
}); });
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () { this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -46,6 +47,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE); self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
}, },
setValue: function (v) { setValue: function (v) {

4
src/widget/date/calendar/picker.date.js

@ -68,6 +68,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -79,7 +80,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
}); });
this.month = BI.createWidget({ this.month = BI.createWidget({
type: "bi.month_date_combo" type: "bi.month_date_combo",
behaviors: o.behaviors
}); });
this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () { this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () {
self.setValue({ self.setValue({

1
src/widget/date/calendar/popup.calendar.date.js

@ -46,6 +46,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
}; };
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });

1
src/widget/datepane/card.static.datepane.js

@ -26,6 +26,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });

3
src/widget/datepane/datepane.js

@ -5,7 +5,7 @@ BI.DynamicDatePane = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -62,6 +62,7 @@ BI.DynamicDatePane = BI.inherit(BI.Widget, {
case BI.DynamicDatePane.Static: case BI.DynamicDatePane.Static:
return { return {
type: "bi.static_date_pane_card", type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {

1
src/widget/datetime/datetime.combo.js

@ -38,6 +38,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value value: opts.value

1
src/widget/datetime/datetime.popup.js

@ -36,6 +36,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({ this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max max: self.options.max
}); });

1
src/widget/datetimepane/card.static.datetimepane.js

@ -23,6 +23,7 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({ this.datePicker = BI.createWidget({
type: "bi.date_picker", type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });

3
src/widget/datetimepane/datetimepane.js

@ -5,7 +5,7 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
@ -62,6 +62,7 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, {
case BI.DynamicDateTimePane.Static: case BI.DynamicDateTimePane.Static:
return { return {
type: "bi.static_date_time_pane_card", type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {

1
src/widget/dynamicdate/dynamicdate.combo.js

@ -125,6 +125,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_popup", type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,

3
src/widget/dynamicdate/dynamicdate.popup.js

@ -69,7 +69,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -108,6 +108,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default: default:
return { return {
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
listeners: [{ listeners: [{

1
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -125,6 +125,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
popup: { popup: {
el: { el: {
type: "bi.dynamic_date_time_popup", type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE, max: this.constants.DATE_MAX_VALUE,
value: opts.value, value: opts.value,

3
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -69,7 +69,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, },
_getTabJson: function () { _getTabJson: function () {
var self = this; var self = this, o = this.options;
return { return {
type: "bi.tab", type: "bi.tab",
ref: function () { ref: function () {
@ -110,6 +110,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [{
type: "bi.date_calendar_popup", type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min, min: self.options.min,
max: self.options.max, max: self.options.max,
ref: function () { ref: function () {

1
src/widget/multilayerselecttree/multilayerselecttree.popup.js

@ -36,6 +36,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });

1
src/widget/multilayersingletree/multilayersingletree.popup.js

@ -35,6 +35,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false, scrolly: false,
scrollable: true, scrollable: true,
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });

7
src/widget/multiselect/multiselect.loader.js

@ -32,7 +32,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.select_list", type: "bi.select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -99,6 +98,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });

9
src/widget/multiselect/multiselect.loader.nobar.js

@ -32,7 +32,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({ this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane", type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
el: { el: {
type: "bi.loader", type: "bi.loader",
@ -96,6 +95,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}, opts.el)); }, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });

1
src/widget/selecttree/selecttree.popup.js

@ -66,6 +66,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });

10
src/widget/singleselect/singleselect.loader.js

@ -29,7 +29,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value; this.storeValue = opts.value;
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.single_select_list", type: "bi.single_select_list",
element: this,
logic: opts.logic, logic: opts.logic,
el: BI.extend({ el: BI.extend({
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
@ -86,6 +85,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
}, },
value: this.storeValue value: this.storeValue
}); });
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () { this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -98,6 +105,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, { return BI.createItems(items, {
type: "bi.single_select_combo.item", type: "bi.single_select_combo.item",
logic: this.options.logic, logic: this.options.logic,
cls: "bi-list-item-active",
height: 24, height: 24,
selected: false selected: false
}); });

1
src/widget/singletree/singletree.popup.js

@ -32,6 +32,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
vgap: 5,
items: [this.tree] items: [this.tree]
}); });

3
src/widget/timeinterval/dateinterval.js

@ -65,9 +65,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_combo", type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {

3
src/widget/timeinterval/timeinterval.js

@ -65,9 +65,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
}, },
_createCombo: function (v) { _createCombo: function (v) {
var self = this; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo", type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v value: v
}); });
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () { combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {

2
ui/css/font.css

@ -214,7 +214,7 @@
.dot-e-font:hover .b-font:before, .dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e762"; content: "\e762";
color: #999999; color: rgba(54, 133, 242, 0.06);
} }
.dot-e-font:active .b-font:before { .dot-e-font:active .b-font:before {
content: "\e762"; content: "\e762";

Loading…
Cancel
Save