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

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

* commit '24d7fee88a19030d7b4efb3386d3895a3ef02c74':
  BI-24463 && BI-25251
es6
imp 6 years ago
parent
bfa404199a 24d7fee88a
commit
60d03ba644
34 changed files with 289 additions and 169 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      dist/_fineui.min.js
  2. 36
      dist/bundle.css
  3. 36
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 32
      dist/bundle.min.js
  6. 34
      dist/core.css
  7. 34
      dist/core_without_normalize.css
  8. 36
      dist/fineui.css
  9. 36
      dist/fineui.js
  10. 2
      dist/fineui.min.css
  11. 32
      dist/fineui.min.js
  12. 2
      dist/resource.css
  13. 36
      dist/widget.js
  14. 2
      public/css/font.css
  15. 34
      src/css/core/utils/common.css
  16. 2
      src/css/resource/font.css
  17. 30
      src/less/core/utils/common.less
  18. 2
      src/less/resource/font.less
  19. 7
      src/widget/date/calendar/combo.month.date.js
  20. 4
      src/widget/date/calendar/picker.date.js
  21. 1
      src/widget/date/calendar/popup.calendar.date.js
  22. 1
      src/widget/datepane/card.static.datepane.js
  23. 3
      src/widget/datepane/datepane.js
  24. 1
      src/widget/datetime/datetime.combo.js
  25. 1
      src/widget/datetime/datetime.popup.js
  26. 1
      src/widget/datetimepane/card.static.datetimepane.js
  27. 3
      src/widget/datetimepane/datetimepane.js
  28. 1
      src/widget/dynamicdate/dynamicdate.combo.js
  29. 3
      src/widget/dynamicdate/dynamicdate.popup.js
  30. 1
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  31. 3
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  32. 3
      src/widget/timeinterval/dateinterval.js
  33. 3
      src/widget/timeinterval/timeinterval.js
  34. 2
      ui/css/font.css

32
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
dist/bundle.css vendored
Unescape View File

@ -826,7 +826,6 @@ textarea {
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input {
@ -836,19 +835,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea {
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 {
color: #3685f2;
background-color: #ffffff;
}
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input {
color: #3685f2;
}
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea {
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:hover,
.bi-list-item-active2.disabled:active {
@ -919,18 +934,9 @@ textarea {
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:hover .bi-input,
.bi-list-item-select.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-select:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-select:active,
.bi-list-item-select.active {
color: #ffffff;
@ -4666,7 +4672,7 @@ textarea::-webkit-scrollbar-thumb:hover {
.dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before {
content: "\e762";
color: #999999;
color: rgba(54, 133, 242, 0.06);
}
.dot-e-font:active .b-font:before {
content: "\e762";

36
dist/bundle.js vendored
Unescape View File

@ -88077,7 +88077,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
});
this.popup = BI.createWidget({
type: "bi.month_popup"
type: "bi.month_popup",
behaviors: o.behaviors
});
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -88102,6 +88103,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
},
setValue: function (v) {
@ -88256,6 +88261,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({
type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -88267,7 +88273,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE);
});
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 () {
self.setValue({
@ -88501,6 +88508,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
};
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -88756,6 +88764,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -88860,7 +88869,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.vtape",
items: [{
@ -88917,6 +88926,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
case BI.DynamicDatePane.Static:
return {
type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -89044,6 +89054,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({
type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value
@ -89170,6 +89181,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min,
max: self.options.max
});
@ -89497,6 +89509,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -89628,7 +89641,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.vtape",
items: [{
@ -89685,6 +89698,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
case BI.DynamicDateTimePane.Static:
return {
type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -90913,6 +90927,7 @@ BI.extend(BI.DynamicDateCard, {
popup: {
el: {
type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value,
@ -91250,7 +91265,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
},
_getTabJson: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function () {
@ -91289,6 +91304,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default:
return {
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min,
max: self.options.max,
listeners: [{
@ -91786,6 +91802,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
popup: {
el: {
type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value,
@ -92013,7 +92030,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
},
_getTabJson: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function () {
@ -92054,6 +92071,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.vtape",
items: [{
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min,
max: self.options.max,
ref: function () {
@ -109819,9 +109837,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
},
_createCombo: function (v) {
var self = this;
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v
});
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {
@ -109998,9 +110017,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
},
_createCombo: function (v) {
var self = this;
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v
});
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

32
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

34
dist/core.css vendored
Unescape View File

@ -826,7 +826,6 @@ textarea {
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input {
@ -836,19 +835,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea {
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 {
color: #3685f2;
background-color: #ffffff;
}
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input {
color: #3685f2;
}
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea {
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:hover,
.bi-list-item-active2.disabled:active {
@ -919,18 +934,9 @@ textarea {
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:hover .bi-input,
.bi-list-item-select.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-select:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-select:active,
.bi-list-item-select.active {
color: #ffffff;

34
dist/core_without_normalize.css vendored
Unescape View File

@ -548,7 +548,6 @@ textarea {
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input {
@ -558,19 +557,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea {
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 {
color: #3685f2;
background-color: #ffffff;
}
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input {
color: #3685f2;
}
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea {
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:hover,
.bi-list-item-active2.disabled:active {
@ -641,18 +656,9 @@ textarea {
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:hover .bi-input,
.bi-list-item-select.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-select:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-select:active,
.bi-list-item-select.active {
color: #ffffff;

36
dist/fineui.css vendored
Unescape View File

@ -826,7 +826,6 @@ textarea {
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input {
@ -836,19 +835,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea {
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 {
color: #3685f2;
background-color: #ffffff;
}
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input {
color: #3685f2;
}
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea {
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:hover,
.bi-list-item-active2.disabled:active {
@ -919,18 +934,9 @@ textarea {
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:hover .bi-input,
.bi-list-item-select.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-select:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-select:active,
.bi-list-item-select.active {
color: #ffffff;
@ -4666,7 +4672,7 @@ textarea::-webkit-scrollbar-thumb:hover {
.dot-e-font:hover .b-font:before,
.dot-e-font.hover .b-font:before {
content: "\e762";
color: #999999;
color: rgba(54, 133, 242, 0.06);
}
.dot-e-font:active .b-font:before {
content: "\e762";

36
dist/fineui.js vendored
Unescape View File

@ -88320,7 +88320,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
});
this.popup = BI.createWidget({
type: "bi.month_popup"
type: "bi.month_popup",
behaviors: o.behaviors
});
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -88345,6 +88346,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
},
setValue: function (v) {
@ -88499,6 +88504,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({
type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -88510,7 +88516,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE);
});
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 () {
self.setValue({
@ -88744,6 +88751,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
};
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -88999,6 +89007,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -89103,7 +89112,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.vtape",
items: [{
@ -89160,6 +89169,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
case BI.DynamicDatePane.Static:
return {
type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -89287,6 +89297,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({
type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value
@ -89413,6 +89424,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min,
max: self.options.max
});
@ -89740,6 +89752,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -89871,7 +89884,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.vtape",
items: [{
@ -89928,6 +89941,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
case BI.DynamicDateTimePane.Static:
return {
type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -91156,6 +91170,7 @@ BI.extend(BI.DynamicDateCard, {
popup: {
el: {
type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value,
@ -91493,7 +91508,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
},
_getTabJson: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function () {
@ -91532,6 +91547,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default:
return {
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min,
max: self.options.max,
listeners: [{
@ -92029,6 +92045,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
popup: {
el: {
type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value,
@ -92256,7 +92273,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
},
_getTabJson: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function () {
@ -92297,6 +92314,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.vtape",
items: [{
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min,
max: self.options.max,
ref: function () {
@ -110062,9 +110080,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
},
_createCombo: function (v) {
var self = this;
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v
});
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {
@ -110241,9 +110260,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
},
_createCombo: function (v) {
var self = this;
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v
});
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

32
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored
Unescape View File

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

36
dist/widget.js vendored
Unescape View File

@ -441,7 +441,8 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
});
this.popup = BI.createWidget({
type: "bi.month_popup"
type: "bi.month_popup",
behaviors: o.behaviors
});
this.popup.on(BI.YearPopup.EVENT_CHANGE, function () {
@ -466,6 +467,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
self.combo.hideView();
self.fireEvent(BI.MonthDateCombo.EVENT_CHANGE);
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self.doBehavior();
});
},
setValue: function (v) {
@ -620,6 +625,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({
type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -631,7 +637,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE);
});
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 () {
self.setValue({
@ -865,6 +872,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
};
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -1120,6 +1128,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -1224,7 +1233,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.vtape",
items: [{
@ -1281,6 +1290,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
case BI.DynamicDatePane.Static:
return {
type: "bi.static_date_pane_card",
behaviors: o.behaviors,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -1408,6 +1418,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup = BI.createWidget({
type: "bi.date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value
@ -1534,6 +1545,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.dateCombo = BI.createWidget({
type: "bi.date_calendar_popup",
behaviors: opts.behaviors,
min: self.options.min,
max: self.options.max
});
@ -1861,6 +1873,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
this.datePicker = BI.createWidget({
type: "bi.date_picker",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -1992,7 +2005,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.vtape",
items: [{
@ -2049,6 +2062,7 @@ BI.shortcut("bi.static_date_time_pane_card", BI.StaticDateTimePaneCard);BI.Dynam
case BI.DynamicDateTimePane.Static:
return {
type: "bi.static_date_time_pane_card",
behaviors: o.behaviors,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -3277,6 +3291,7 @@ BI.extend(BI.DynamicDateCard, {
popup: {
el: {
type: "bi.dynamic_date_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value,
@ -3614,7 +3629,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
},
_getTabJson: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function () {
@ -3653,6 +3668,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
default:
return {
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min,
max: self.options.max,
listeners: [{
@ -4150,6 +4166,7 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
popup: {
el: {
type: "bi.dynamic_date_time_popup",
behaviors: opts.behaviors,
min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE,
value: opts.value,
@ -4377,7 +4394,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
},
_getTabJson: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function () {
@ -4418,6 +4435,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
type: "bi.vtape",
items: [{
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
min: self.options.min,
max: self.options.max,
ref: function () {
@ -22183,9 +22201,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
},
_createCombo: function (v) {
var self = this;
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_combo",
behaviors: o.behaviors,
value: v
});
combo.on(BI.DynamicDateCombo.EVENT_ERROR, function () {
@ -22362,9 +22381,10 @@ BI.TimeInterval = BI.inherit(BI.Single, {
},
_createCombo: function (v) {
var self = this;
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo",
behaviors: o.behaviors,
value: v
});
combo.on(BI.DynamicDateTimeCombo.EVENT_ERROR, function () {

2
public/css/font.css
Unescape View File

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

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

@ -548,7 +548,6 @@ textarea {
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2:hover .bi-input,
.bi-list-item-active2.hover .bi-input {
@ -558,19 +557,35 @@ textarea {
.bi-list-item-active2.hover .bi-textarea {
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 {
color: #3685f2;
background-color: #ffffff;
}
.bi-list-item-active2.active .bi-input,
.bi-list-item-active2:active .bi-input {
color: #3685f2;
}
.bi-list-item-active2.active .bi-textarea,
.bi-list-item-active2:active .bi-textarea {
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:hover,
.bi-list-item-active2.disabled:active {
@ -641,18 +656,9 @@ textarea {
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
background-color: rgba(54, 133, 242, 0.06);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
}
.bi-list-item-select:hover .bi-input,
.bi-list-item-select.hover .bi-input {
color: #1a1a1a;
}
.bi-list-item-select:hover .bi-textarea,
.bi-list-item-select.hover .bi-textarea {
color: #1a1a1a;
}
.bi-list-item-select:active,
.bi-list-item-select.active {
color: #ffffff;

2
src/css/resource/font.css
Unescape View File

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

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

@ -582,9 +582,11 @@ textarea {
& .bi-textarea {
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;
& .bi-input {
color: @color-bi-text-highlight;
@ -592,7 +594,22 @@ textarea {
& .bi-textarea {
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 {
&, &:hover, &:active {
@ -654,13 +671,6 @@ textarea {
// 激活和选中时背景高亮
.bi-list-item-select {
&:hover, &.hover {
color: @color-bi-text-black;
& .bi-input {
color: @color-bi-text-black;
}
& .bi-textarea {
color: @color-bi-text-black;
}
.background-color(@color-bi-background-highlight, 6%);
}
&:active, &.active {

2
src/less/resource/font.less
Unescape View File

@ -38,7 +38,7 @@
.font(dot-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-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);

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

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

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

@ -68,6 +68,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({
type: "bi.year_date_combo",
behaviors: o.behaviors,
min: o.min,
max: o.max
});
@ -79,7 +80,8 @@ BI.DatePicker = BI.inherit(BI.Widget, {
self.fireEvent(BI.DatePicker.EVENT_CHANGE);
});
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 () {
self.setValue({

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

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

1
src/widget/datepane/card.static.datepane.js
Unescape View File

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

3
src/widget/datepane/datepane.js
Unescape View File

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

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

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

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

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

1
src/widget/datetimepane/card.static.datetimepane.js
Unescape View File

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

3
src/widget/datetimepane/datetimepane.js
Unescape View File

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

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

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

3
src/widget/dynamicdate/dynamicdate.popup.js
Unescape View File

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

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

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

3
src/widget/dynamicdatetime/dynamicdatetime.popup.js
Unescape View File

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

3
src/widget/timeinterval/dateinterval.js
Unescape View File

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

3
src/widget/timeinterval/timeinterval.js
Unescape View File

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

2
ui/css/font.css
Unescape View File

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

Write Preview
Loading…
Cancel
Save