Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/_fineui.min.js # dist/fineui.min.js
7 years ago · bdea6fdc17
8 changed files with 179 additions and 74 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -90094,7 +90094,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                                type: "bi.vertical"
                            }]

-                        }
+                        },
+                        maxHeight: 378
                    };
                    item.el.childValues = [];
                    BI.each(item.children, function (i, child) {
@ -111745,8 +111746,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.items = o.items;
-            this.populate();
+            this.populate(o.items);
        }
    },

--- a/dist/demo.js
+++ b/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
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -90337,7 +90337,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                                type: "bi.vertical"
                            }]

-                        }
+                        },
+                        maxHeight: 378
                    };
                    item.el.childValues = [];
                    BI.each(item.children, function (i, child) {
@ -111988,8 +111989,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.items = o.items;
-            this.populate();
+            this.populate(o.items);
        }
    },

--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
@ -2540,7 +2540,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                                type: "bi.vertical"
                            }]

-                        }
+                        },
+                        maxHeight: 378
                    };
                    item.el.childValues = [];
                    BI.each(item.children, function (i, child) {
@ -24191,8 +24192,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.items = o.items;
-            this.populate();
+            this.populate(o.items);
        }
    },

--- a/src/component/valuechooser/pane.valuechooser.js
+++ b/src/component/valuechooser/pane.valuechooser.js
@ -31,8 +31,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
            self.fireEvent(BI.ValueChooserPane.EVENT_CHANGE);
        });
        if (BI.isNotNull(o.items)) {
-            this.items = o.items;
-            this.populate();
+            this.populate(o.items);
        }
    },

--- a/src/widget/downlist/popup.downlist.js
+++ b/src/widget/downlist/popup.downlist.js
@ -105,7 +105,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                                type: "bi.vertical"
                            }]

-                        }
+                        },
+                        maxHeight: 378
                    };
                    item.el.childValues = [];
                    BI.each(item.children, function (i, child) {