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

* commit '9fe6d5def976d4e5ca7c5a4b80daf877e51c42aa':
  update
  BI-19679

dist/bundle.js

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

dist/demo.js

@@ -11014,6 +11014,111 @@ BI.shortcut("demo.tmp", Demo.Func);
     });
 
     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
  * @CreationDate 2017-11-06 10:32

dist/fineui.js

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

dist/widget.js

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

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

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

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

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

src/widget/month/popup.month.js

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