Browse Source

Merge pull request #376 in FUI/fineui from ~WINDY/fui:master to master

* commit '9fe6d5def976d4e5ca7c5a4b80daf877e51c42aa':
  update
  BI-19679
es6
guy 7 years ago
parent
commit
63042361cd
  1. 6
      dist/_fineui.min.js
  2. 3
      dist/bundle.js
  3. 18
      dist/bundle.min.js
  4. 105
      dist/demo.js
  5. 3
      dist/fineui.js
  6. 6
      dist/fineui.min.js
  7. 3
      dist/widget.js
  8. 1
      src/widget/date/calendar/popup.year.js
  9. 1
      src/widget/datetimepane/card.static.datetimepane.js
  10. 1
      src/widget/month/popup.month.js

6
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/bundle.js vendored

@ -88472,6 +88472,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
var o = this.options; var o = this.options;
v = BI.parseInt(v);
if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) { if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) {
v = BI.getDate().getFullYear(); v = BI.getDate().getFullYear();
this.selectedYear = ""; this.selectedYear = "";
@ -89353,6 +89354,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
listeners: [{ listeners: [{
eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM, eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM,
action: function () { action: function () {
self.selectedTime = BI.extend(self.calendar.getValue(), self.timeSelect.getValue());
self.fireEvent("EVENT_CHANGE"); self.fireEvent("EVENT_CHANGE");
} }
}] }]
@ -95134,6 +95136,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
v = BI.parseInt(v);
this.month.setValue([v]); this.month.setValue([v]);
} }
}); });

18
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

105
dist/demo.js vendored

@ -11014,6 +11014,111 @@ BI.shortcut("demo.tmp", Demo.Func);
}); });
BI.shortcut("demo.fix_global_watcher", Demo.Fix); BI.shortcut("demo.fix_global_watcher", Demo.Fix);
}());(function () {
var State = BI.inherit(Fix.Model, {
state: function () {
return {
name: "原始属性",
info: {
age: 12,
sex: "male",
birth: {
year: 2018,
month: 9,
day: 11
}
},
career: [{
a: 1,
b: 2,
c: 3
}]
};
},
computed: {
b: function () {
return this.model.name + "-计算属性";
},
birth: function () {
return this.model.info.birth;
}
}
});
Demo.Fix = BI.inherit(BI.Widget, {
_store: function () {
return new State();
},
watch: {
b: function () {
this.button.setText(this.model.b);
},
"birth.**": function () {
console.log(123);
}
},
render: function () {
var self = this;
return {
type: "bi.vertical",
items: [{
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.name = "这是改变后的属性";
},
text: this.model.b
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.birth.year = 2019;
},
text: "birthYearButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career.push({
year: 2017,
month: 3,
day: 24
});
},
text: "careerAddButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career[0].a = 24;
},
text: "careerChangeButton"
}
}]
};
},
mounted: function () {
}
});
BI.shortcut("demo.fix_immutable", Demo.Fix);
}());/** }());/**
* @Author: Young * @Author: Young
* @CreationDate 2017-11-06 10:32 * @CreationDate 2017-11-06 10:32

3
dist/fineui.js vendored

@ -88715,6 +88715,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
var o = this.options; var o = this.options;
v = BI.parseInt(v);
if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) { if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) {
v = BI.getDate().getFullYear(); v = BI.getDate().getFullYear();
this.selectedYear = ""; this.selectedYear = "";
@ -89596,6 +89597,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
listeners: [{ listeners: [{
eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM, eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM,
action: function () { action: function () {
self.selectedTime = BI.extend(self.calendar.getValue(), self.timeSelect.getValue());
self.fireEvent("EVENT_CHANGE"); self.fireEvent("EVENT_CHANGE");
} }
}] }]
@ -95377,6 +95379,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
v = BI.parseInt(v);
this.month.setValue([v]); this.month.setValue([v]);
} }
}); });

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/widget.js vendored

@ -1004,6 +1004,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
var o = this.options; var o = this.options;
v = BI.parseInt(v);
if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) { if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) {
v = BI.getDate().getFullYear(); v = BI.getDate().getFullYear();
this.selectedYear = ""; this.selectedYear = "";
@ -1885,6 +1886,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
listeners: [{ listeners: [{
eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM, eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM,
action: function () { action: function () {
self.selectedTime = BI.extend(self.calendar.getValue(), self.timeSelect.getValue());
self.fireEvent("EVENT_CHANGE"); self.fireEvent("EVENT_CHANGE");
} }
}] }]
@ -7666,6 +7668,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
v = BI.parseInt(v);
this.month.setValue([v]); this.month.setValue([v]);
} }
}); });

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

@ -94,6 +94,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
var o = this.options; var o = this.options;
v = BI.parseInt(v);
if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) { if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) {
v = BI.getDate().getFullYear(); v = BI.getDate().getFullYear();
this.selectedYear = ""; this.selectedYear = "";

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

@ -71,6 +71,7 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
listeners: [{ listeners: [{
eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM, eventName: BI.DynamicDateTimeSelect.EVENT_CONFIRM,
action: function () { action: function () {
self.selectedTime = BI.extend(self.calendar.getValue(), self.timeSelect.getValue());
self.fireEvent("EVENT_CHANGE"); self.fireEvent("EVENT_CHANGE");
} }
}] }]

1
src/widget/month/popup.month.js

@ -77,6 +77,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
v = BI.parseInt(v);
this.month.setValue([v]); this.month.setValue([v]);
} }
}); });

Loading…
Cancel
Save