Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~fay/fineui

6 years ago · 0cfca7565d
8 changed files with 7 additions and 108 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -90248,6 +90248,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
            if (BI.isNotNull(obj.year)) {
                return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
            }
+            return date;
        }
    });
 })();BI.DynamicDateCard = BI.inherit(BI.Widget, {
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/demo.js
+++ b/dist/demo.js
@ -11014,111 +11014,6 @@ 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
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -90491,6 +90491,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
            if (BI.isNotNull(obj.year)) {
                return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
            }
+            return date;
        }
    });
 })();BI.DynamicDateCard = BI.inherit(BI.Widget, {
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
@ -2762,6 +2762,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
            if (BI.isNotNull(obj.year)) {
                return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
            }
+            return date;
        }
    });
 })();BI.DynamicDateCard = BI.inherit(BI.Widget, {
--- a/src/widget/dynamicdate/dynamicdate.caculate.js
+++ b/src/widget/dynamicdate/dynamicdate.caculate.js
@ -48,6 +48,7 @@
            if (BI.isNotNull(obj.year)) {
                return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
            }
+            return date;
        }
    });
 })();